Skip to content

Commit 90a33fa

Browse files
committed
[run-test] Change default path for "lit.py" executable.
Since swiftlang@1b4b7f9 has been committed, `update-checkout` clones "llvm-project" repo but does not clone "llvm" repo itself alone by default. That may cause `run-test` failure because "lit.py" cannot be found. This commit fixes the issue.
1 parent a8f2f95 commit 90a33fa

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

utils/run-test

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,19 @@ SWIFT_SOURCE_DIR = os.path.join(SWIFT_SOURCE_ROOT, 'swift')
4747
TEST_SOURCE_DIR = os.path.join(SWIFT_SOURCE_DIR, 'test')
4848
VALIDATION_TEST_SOURCE_DIR = os.path.join(SWIFT_SOURCE_DIR, 'validation-test')
4949

50-
LIT_BIN_DEFAULT = os.path.join(SWIFT_SOURCE_ROOT, 'llvm',
50+
51+
def _get_default_llvm_source_dir():
52+
legacy_llvm_dir_path = os.path.join(SWIFT_SOURCE_ROOT, 'llvm')
53+
if os.path.isdir(legacy_llvm_dir_path):
54+
return legacy_llvm_dir_path
55+
return os.path.join(SWIFT_SOURCE_ROOT, 'llvm-project', 'llvm')
56+
57+
58+
# Default path for "lit.py" executable.
59+
LIT_BIN_DEFAULT = os.path.join(os.environ.get("LLVM_SOURCE_DIR",
60+
_get_default_llvm_source_dir()),
5161
'utils', 'lit', 'lit.py')
62+
5263
host_target = StdlibDeploymentTarget.host_target().name
5364

5465

0 commit comments

Comments
 (0)