[PATCH] D109000: [llvm-lit] unbreak clang-only builds by not assuming llvm-lit in build dir

[Yaron Keren via Phabricator via cfe-commits]

yaron.keren created this revision.
yaron.keren added a reviewer: tstellar.
yaron.keren requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D109000

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


Index: clang/test/utils/update_cc_test_checks/lit.local.cfg
===================================================================
--- clang/test/utils/update_cc_test_checks/lit.local.cfg
+++ clang/test/utils/update_cc_test_checks/lit.local.cfg
@@ -21,8 +21,10 @@
                            'update_cc_test_checks.py')
 assert os.path.isfile(script_path)
 # 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)
+if config.llvm_external_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)
 config.substitutions.append(
     ('%update_cc_test_checks', "%s %s %s" % (



Index: clang/test/utils/update_cc_test_checks/lit.local.cfg
===================================================================
--- clang/test/utils/update_cc_test_checks/lit.local.cfg
+++ clang/test/utils/update_cc_test_checks/lit.local.cfg
@@ -21,8 +21,10 @@
                            'update_cc_test_checks.py')
 assert os.path.isfile(script_path)
 # 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)
+if config.llvm_external_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)
 config.substitutions.append(
     ('%update_cc_test_checks', "%s %s %s" % (

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits