This is an archive of the discontinued LLVM Phabricator instance.

Differential D109000

[llvm-lit] unbreak clang-only builds by not assuming llvm-lit in build dir
ClosedPublic

Authored by yaron.keren on Aug 31 2021, 8:03 AM.

Details

Reviewers
tstellar
Commits
rG10d78a06baa2: [llvm-lit] unbreak clang-only builds by not assuming llvm-lit in build dir

Diff Detail

Event Timeline

yaron.keren requested review of this revision.Aug 31 2021, 8:03 AM
yaron.keren created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptAug 31 2021, 8:03 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
yaron.keren mentioned this in D108085: Use installed llvm-lit.py instead of lit.py PR-51072.Aug 31 2021, 8:04 AM

Addressing comment in https://reviews.llvm.org/D108085

Harbormaster completed remote builds in B121936: Diff 369702.Aug 31 2021, 8:41 AM
tstellar accepted this revision.Aug 31 2021, 8:55 AM

LGTM, thank you.

This revision is now accepted and ready to land.Aug 31 2021, 8:55 AM
Closed by commit rG10d78a06baa2: [llvm-lit] unbreak clang-only builds by not assuming llvm-lit in build dir (authored by yaron.keren). · Explain WhyAug 31 2021, 8:58 AM
This revision was automatically updated to reflect the committed changes.
yaron.keren added a commit: rG10d78a06baa2: [llvm-lit] unbreak clang-only builds by not assuming llvm-lit in build dir.

Revision Contents

PathSize
clang/
test/
utils/
update_cc_test_checks/
6 lines

Diff 369718

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

Show All 15 Lines
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)
# Windows: llvm-lit.py, Linux: llvm-lit # Windows: llvm-lit.py, Linux: llvm-lit
llvm_lit = glob.glob(os.path.join(config.llvm_tools_dir, 'llvm-lit*'))[0] if config.llvm_external_lit:
lit = config.llvm_external_lit if config.llvm_external_lit else shell_quote(llvm_lit) lit = config.llvm_external_lit
else:
lit = shell_quote(glob.glob(os.path.join(config.llvm_tools_dir, 'llvm-lit*'))[0])
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))))