Author: Nico Weber Date: 2021-06-25T14:01:29-04:00 New Revision: fda790fbfa0cba426d5e3787429a51e09ec64c6d
URL: https://github.com/llvm/llvm-project/commit/fda790fbfa0cba426d5e3787429a51e09ec64c6d DIFF: https://github.com/llvm/llvm-project/commit/fda790fbfa0cba426d5e3787429a51e09ec64c6d.diff LOG: [clang] Make fewer assumptions about path to lit.site.cfg after 9eaf0d120d32 Added: Modified: clang/test/lit.site.cfg.py.in clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example clang/test/utils/update_cc_test_checks/lit.local.cfg Removed: ################################################################################ diff --git a/clang/test/lit.site.cfg.py.in b/clang/test/lit.site.cfg.py.in index 85526b9d30d6a..f31ede2c39575 100644 --- a/clang/test/lit.site.cfg.py.in +++ b/clang/test/lit.site.cfg.py.in @@ -10,6 +10,7 @@ config.llvm_shlib_dir = path(r"@SHLIBDIR@") config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@" config.lit_tools_dir = path(r"@LLVM_LIT_TOOLS_DIR@") config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@" +config.clang_lit_site_cfg = __file__ config.clang_obj_root = path(r"@CLANG_BINARY_DIR@") config.clang_src_dir = path(r"@CLANG_SOURCE_DIR@") config.clang_tools_dir = path(r"@CLANG_TOOLS_DIR@") diff --git a/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example b/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example index c1afdc47956a3..4e221c70b62f7 100644 --- a/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example +++ b/clang/test/utils/update_cc_test_checks/Inputs/lit.cfg.example @@ -1,7 +1,6 @@ import lit lit_config.load_config( - config, os.path.join(lit_config.params.get('clang_obj_root'), - "test/lit.site.cfg.py")) + config, os.path.join(lit_config.params.get('clang_lit_site_cfg'))) config.name = 'update_cc_test_checks.py example' config.suffixes = ['.c', '.cpp'] config.test_format = lit.formats.ShTest(execute_external=False) diff --git a/clang/test/utils/update_cc_test_checks/lit.local.cfg b/clang/test/utils/update_cc_test_checks/lit.local.cfg index b61309fdf0f3c..cbcc05dff4ca7 100644 --- a/clang/test/utils/update_cc_test_checks/lit.local.cfg +++ b/clang/test/utils/update_cc_test_checks/lit.local.cfg @@ -27,5 +27,5 @@ config.substitutions.append( config.substitutions.append( ('%clang_tools_dir', shell_quote(config.clang_tools_dir))) config.substitutions.append( - ('%lit', "%s %s -Dclang_obj_root=%s -j1 -vv" % ( - python, lit, shell_quote(config.clang_obj_root)))) + ('%lit', "%s %s -Dclang_lit_site_cfg=%s -j1 -vv" % ( + python, lit, shell_quote(config.clang_lit_site_cfg)))) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits