Skip to content

Commit 7379f45

Browse files
committed
[test] Isolate build-script calls in skip-local-build.test-sh
This will align skip-local-build.test-sh with the behaviour of the other BuildSystem tests, by * ensuring we use the cmake exposed in lit.cfg, so that under Linux we don't attempt to rebuild it * using a separate build folder for build-script invocations, so that side effects will not affect the main invocation and other lit tests. I expect these changes to prevent llvm-targets-options.test to fail in Linux presets with an error related to cmake, e.g. ``` build-script: error: argument --cmake: /home/buildnode/jenkins/workspace/ oss-swift-package-linux-ubuntu-18_04/build/cmake-linux-x86_64/bin/cmake is not an executable ``` Addresses rdar://78320684
1 parent 6b1b9ba commit 7379f45

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# REQUIRES: standalone_build
2-
#
3-
# RUN: %swift_src_root/utils/build-script --dump-config --skip-local-build 2>&1 | %FileCheck %s -check-prefix=CONFIG
2+
3+
# RUN: %empty-directory(%t)
4+
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --cmake %cmake --dump-config --skip-local-build 2>&1 | %FileCheck %s -check-prefix=CONFIG
45
# CONFIG: "skip_local_build": true
56

6-
# RUN: %swift_src_root/utils/build-script --dry-run --verbose-build --skip-local-build 2>&1 | %FileCheck %s -check-prefix=DRY
7+
# RUN: %empty-directory(%t)
8+
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --cmake %cmake --dry-run --verbose-build --skip-local-build 2>&1 | %FileCheck %s -check-prefix=DRY
79
# DRY: build-script-impl
810
# DRY-SAME: --skip-local-build

0 commit comments

Comments
 (0)