Skip to content

Commit 6fd7336

Browse files
committed
[SR-1628] Run swift-integration-tests in a sandboxed directory.
- This should fix possible issues with the test outputs being in a shared directory on CI machines running concurrent builds. - https://bugs.swift.org/browse/SR-1628
1 parent 4b232fa commit 6fd7336

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

utils/build-script-impl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2500,7 +2500,8 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
25002500
if [[ "${TEST_INSTALLABLE_PACKAGE}" ]] ; then
25012501
PKG_TESTS_SOURCE_DIR="${WORKSPACE}/swift-integration-tests"
25022502
PKG_TESTS_SANDBOX_PARENT="$(build_directory swift_package_sandbox none)"
2503-
2503+
PKG_TESTS_TEMPS="${PKG_TESTS_SANDBOX_PARENT}"/"tests"
2504+
25042505
if [[ "$(uname -s)" == "Darwin" ]] ; then
25052506
PKG_TESTS_SANDBOX="${PKG_TESTS_SANDBOX_PARENT}"/"${TOOLCHAIN_PREFIX}"
25062507
else # Linux
@@ -2518,7 +2519,7 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
25182519
popd
25192520

25202521
(cd "${PKG_TESTS_SOURCE_DIR}" &&
2521-
python "${LIT_EXECUTABLE_PATH}" . -sv --param package-path="${PKG_TESTS_SANDBOX}" --param filecheck="${FILECHECK_EXECUTABLE_PATH}")
2522+
python "${LIT_EXECUTABLE_PATH}" . -sv --param package-path="${PKG_TESTS_SANDBOX}" --param filecheck="${FILECHECK_EXECUTABLE_PATH}" --param test-exec-root="${PKG_TESTS_TEMPS}")
25222523
{ set +x; } 2>/dev/null
25232524
fi
25242525
fi

0 commit comments

Comments
 (0)