This is an archive of the discontinued LLVM Phabricator instance.

Differential D108218

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

Authored by yaron.keren on Aug 17 2021, 10:20 AM.

Details

Reviewers
None

Diff Detail

Event Timeline

yaron.keren requested review of this revision.Aug 17 2021, 10:20 AM
yaron.keren created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptAug 17 2021, 10:20 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
yaron.keren abandoned this revision.Aug 17 2021, 10:20 AM

opened by mistake

Harbormaster completed remote builds in B119929: Diff 366939.Aug 17 2021, 11:03 AM

Revision Contents

PathSize
clang/
test/
utils/
update_cc_test_checks/
5 lines

Diff 366939

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

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