Skip to content

Commit 32b31b9

Browse files
authored
Merge pull request #66642 from apple/maxd/xctest-python3
[5.8] Call python3 to execute XCTest's build_script.py A workaround for the fact that fixing this in XCTest's repository (swiftlang/swift-corelibs-xctest#441) is blocked on XCTest's CI being broken for unrelated reasons (and ones which I cannot reproduce). Risk: low, all other Python scripts in the `swift` and `swift-package-manager` repositories already include this change and use `python3` in both `main` and `release/5.9` branches. This specific change has been on the `main` and `release/5.9` branches for a while now. Original PRs: #65958 for `main` and #66415 for `release/5.9` Reviewed by: @compnerd, @al45tair, and @shahmishal Resolves: unblocks PRs on the `swift-corelibs-foundation` repository that build XCTest as a part of their CI jobs. Tests: N/A
2 parents e2255b6 + a1d068d commit 32b31b9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

utils/build-script-impl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2418,7 +2418,7 @@ for host in "${ALL_HOSTS[@]}"; do
24182418
XCTEST_BUILD_ARGS="--release"
24192419
fi
24202420

2421-
call "${XCTEST_SOURCE_DIR}"/build_script.py \
2421+
call python3 "${XCTEST_SOURCE_DIR}"/build_script.py \
24222422
--swiftc="${SWIFTC_BIN}" \
24232423
--build-dir="${XCTEST_BUILD_DIR}" \
24242424
--foundation-build-dir="${FOUNDATION_BUILD_DIR}" \
@@ -2964,7 +2964,7 @@ for host in "${ALL_HOSTS[@]}"; do
29642964
echo "--- Running tests for ${product} ---"
29652965
FOUNDATION_BUILD_DIR=$(build_directory ${host} foundation)
29662966
XCTEST_BUILD_DIR=$(build_directory ${host} xctest)
2967-
call "${XCTEST_SOURCE_DIR}"/build_script.py test \
2967+
call python3 "${XCTEST_SOURCE_DIR}"/build_script.py test \
29682968
--swiftc="${SWIFTC_BIN}" \
29692969
--lit="${LLVM_SOURCE_DIR}/utils/lit/lit.py" \
29702970
--foundation-build-dir="${FOUNDATION_BUILD_DIR}" \

0 commit comments

Comments
 (0)