Skip to content

Commit 59df47a

Browse files
committed
Update lit.py references to be relative to the new LLVM monorepo directory
This should fix recent CI failures on Pull Requests, which have been failing due to failing to locate the `lit.py` script. See this forum post describing the LLVM monorepo transition details: https://forums.swift.org/t/llvm-monorepo-transition-happening-on-thursday-the-17th-of-october/29674
1 parent 8cd65a4 commit 59df47a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

XCTest.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
buildConfigurationList = DAA333B81C267AD6000CC115 /* Build configuration list for PBXLegacyTarget "SwiftXCTestFunctionalTests" */;
245245
buildPhases = (
246246
);
247-
buildToolPath = "$(SRCROOT)/../llvm/utils/lit/lit.py";
247+
buildToolPath = "$(SRCROOT)/../llvm-project/llvm/utils/lit/lit.py";
248248
buildWorkingDirectory = "";
249249
dependencies = (
250250
DAA333BA1C267AF3000CC115 /* PBXTargetDependency */,

build_script.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,9 @@ def main(args=sys.argv[1:]):
480480
build_parser.add_argument(
481481
"--test",
482482
help="Whether to run tests after building. Note that you must have "
483-
"cloned https://github.com/apple/swift-llvm at {} in order to "
483+
"cloned https://github.com/apple/llvm-project at {} in order to "
484484
"run this command.".format(os.path.join(
485-
os.path.dirname(SOURCE_DIR), 'llvm')),
485+
os.path.dirname(SOURCE_DIR), 'llvm-project')),
486486
action="store_true")
487487

488488
test_parser = subparsers.add_parser(
@@ -502,7 +502,7 @@ def main(args=sys.argv[1:]):
502502
help="Path to the 'lit' tester tool used to run the test suite. "
503503
"'%(default)s' by default.",
504504
default=os.path.join(os.path.dirname(SOURCE_DIR),
505-
"llvm", "utils", "lit", "lit.py"))
505+
"llvm-project", "llvm", "utils", "lit", "lit.py"))
506506
test_parser.add_argument(
507507
"--foundation-build-dir",
508508
help="Path to swift-corelibs-foundation build products, which the "

0 commit comments

Comments
 (0)