Use installed llvm-lit.py instead of lit.py PR-51072

[yaron.keren]

Summary

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

[yaron.keren]

looking into Linux failures

[yaron.keren]

Support both Windows llvm-lit.py and Linux llvm-lit command name

[yaron.keren]

Switched to Linux repo

[dyung]

LGTM and I can confirm that this change fixes the check-globals.test that was failing due to this issue. Thanks!

[tstellar]

clang/test/utils/update_cc_test_checks/lit.local.cfg

24

This patch breaks stand-alone clang builds, because it assumes llvm-lit* will be present in the build directory. This line should be guarded by if not config.llvm_external_lit.

[yaron.keren]

clang/test/utils/update_cc_test_checks/lit.local.cfg

24

Continued in https://reviews.llvm.org/D109000

clang/test/utils/update_cc_test_checks/lit.local.cfg

 import os
+import glob
 
 import lit.util
 
 # python 2.7 backwards compatibility
 try:
     from shlex import quote as shell_quote
 except ImportError:
     from pipes import quote as shell_quote
 
 
 config.test_format = lit.formats.ShTest(execute_external=False)
 config.suffixes = ['.test']
 
 clang_path = os.path.join(config.clang_tools_dir, 'clang')
 extra_args = '--clang ' + shell_quote(clang_path)
 opt_path = os.path.join(config.llvm_tools_dir, 'opt')
 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" % (
         python, shell_quote(script_path), extra_args)))
 config.substitutions.append(
     ('%clang_tools_dir', shell_quote(config.clang_tools_dir)))
 config.substitutions.append(
     ('%lit', "%s %s -Dclang_lit_site_cfg=%s -j1 -vv" % (
         python, lit, shell_quote(config.clang_lit_site_cfg))))