Skip to content

Commit 2cb2a6c

Browse files
committed
Merge pull request #2739 from ddunbar/SR-1628
[SR-1628] Run swift-integration-tests in a sandboxed directory.
2 parents 73841a6 + 6fd7336 commit 2cb2a6c

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
@@ -2386,7 +2386,8 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
23862386
if [[ "${TEST_INSTALLABLE_PACKAGE}" ]] ; then
23872387
PKG_TESTS_SOURCE_DIR="${WORKSPACE}/swift-integration-tests"
23882388
PKG_TESTS_SANDBOX_PARENT="$(build_directory swift_package_sandbox none)"
2389-
2389+
PKG_TESTS_TEMPS="${PKG_TESTS_SANDBOX_PARENT}"/"tests"
2390+
23902391
if [[ "$(uname -s)" == "Darwin" ]] ; then
23912392
PKG_TESTS_SANDBOX="${PKG_TESTS_SANDBOX_PARENT}"/"${TOOLCHAIN_PREFIX}"
23922393
else # Linux
@@ -2404,7 +2405,7 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
24042405
popd
24052406

24062407
(cd "${PKG_TESTS_SOURCE_DIR}" &&
2407-
python "${LIT_EXECUTABLE_PATH}" . -sv --param package-path="${PKG_TESTS_SANDBOX}" --param filecheck="${FILECHECK_EXECUTABLE_PATH}")
2408+
python "${LIT_EXECUTABLE_PATH}" . -sv --param package-path="${PKG_TESTS_SANDBOX}" --param filecheck="${FILECHECK_EXECUTABLE_PATH}" --param test-exec-root="${PKG_TESTS_TEMPS}")
24082409
{ set +x; } 2>/dev/null
24092410
fi
24102411
fi

0 commit comments

Comments
 (0)