From 5aa0f9cc9ab267803ad7bcfd14c8fd8bbffd82cb Mon Sep 17 00:00:00 2001 From: Yaron Keren Date: Tue, 17 Aug 2021 20:15:39 +0300 Subject: [PATCH] Use installed llvm-lit.py instead of lit.py PR-51072 Three tests fail when building and testing LLVM from the Visual C++ environment since they use the repo version of lit.py that do not have local customization builtin_parameters = { 'build_mode' : 'Release' } https://bugs.llvm.org/show_bug.cgi?id=51072 Reviewed By: dyung Differential Revision: https://reviews.llvm.org/D108085 --- clang/test/utils/update_cc_test_checks/lit.local.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 14d1ba2..6b4f5cf 100644 --- a/clang/test/utils/update_cc_test_checks/lit.local.cfg +++ b/clang/test/utils/update_cc_test_checks/lit.local.cfg @@ -1,4 +1,5 @@ import os +import glob import lit.util @@ -19,7 +20,9 @@ extra_args += ' --opt ' + shell_quote(opt_path) script_path = os.path.join(config.llvm_src_root, 'utils', 'update_cc_test_checks.py') assert os.path.isfile(script_path) -lit = config.llvm_external_lit if config.llvm_external_lit else shell_quote(os.path.join(config.llvm_src_root, 'utils', 'lit', 'lit.py')) +# Windows: llvm-lit.py, Linux: llvm-lit +llvm_lit = glob.glob(os.path.join(config.llvm_tools_dir, 'llvm-lit*'))[0] +lit = config.llvm_external_lit if config.llvm_external_lit else shell_quote(llvm_lit) python = shell_quote(config.python_executable) config.substitutions.append( ('%update_cc_test_checks', "%s %s %s" % ( -- 2.7.4