Skip to content

Commit 06a2a71

Browse files
authored
[test] Isolate build-script calls in skip-local-build.test-sh (#37611)
...and reenable `llvm-targets-options.test` (previously disabled in #37573). 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
2 parents 27f86ad + d70b15d commit 06a2a71

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

validation-test/BuildSystem/llvm-targets-options.test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Failing in CI with "%cmake is not an executable" rdar://78320684
2-
# UNSUPPORTED: OS=linux-gnu
3-
41
# REQUIRES: standalone_build
52

63
# RUN: %empty-directory(%t)
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)