Skip to content

Commit ec456c9

Browse files
committed
[bootstrap] Preemptively add argument for Foundation
swiftlang/swift-corelibs-xctest#43 will add a dependency between swift-corelibs-xctest and swift-corelibs-foundation. This will necessitate the path to a Foundation build be passed to the SwiftPM bootstrap script. In order to prevent CI from breaking, we'll modify the Swift build script to pass the correct parameters *before* those parameters are actually used. To do that, this commit ensures the bootstrap script accepts the new parameter: "--foundation".
1 parent c3e97ac commit ec456c9

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ Tests are an important part of the development and evolution of this project,
8484
and new contributions are expected to include tests for any functionality
8585
change. To run the tests, pass the `test` verb to the `bootstrap` script:
8686

87-
./Utilities/bootstrap --build-tests test
87+
./Utilities/bootstrap \
88+
--swiftc /path/to/swift-linux-x86_64/bin/swiftc \
89+
--sbt /path/to/llbuild-linux-x86_64/bin/swift-build-tool \
90+
--foundation /path/to/foundation-linux-x86_64/Foundation \
91+
--xctest /path/to/xctest-linux-x86_64 \
92+
test
8893

8994
> Long-term, we intend for testing to be an integral part of the Package Manager itself
9095
> and to not require custom support.

Utilities/bootstrap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,8 @@ def main():
449449
default="/usr/local", metavar="PATH")
450450
parser.add_argument("-v", "--verbose", action="store_true",
451451
help="use verbose output")
452+
parser.add_argument("--foundation", dest="foundation_path",
453+
help="Path to Foundation build directory")
452454
parser.add_argument("--xctest", dest="xctest_path",
453455
help="Path to XCTest build directory")
454456
parser.add_argument("--build-tests", action="store_true",

0 commit comments

Comments
 (0)