Skip to content

Commit 45b74bd

Browse files
authored
Merge pull request #39108 from buttaface/macos-xctest
[build][test] Don't test '--skip-clean-xctest' on Darwin as the source may not be checked out
2 parents a7e999e + cec3e11 commit 45b74bd

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

validation-test/BuildSystem/skip_clean_corelibs.test

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@
66

77
# RUN: %empty-directory(%t)
88
# RUN: mkdir -p %t
9-
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --foundation --cmake %cmake 2>&1 | %FileCheck --check-prefix=CLEAN-CORELIBS-CHECK %s
9+
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --xctest --cmake %cmake 2>&1 | %FileCheck --check-prefix=CLEAN-CORELIBS-CHECK %s
1010

1111
# RUN: %empty-directory(%t)
1212
# RUN: mkdir -p %t
13-
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --foundation --skip-clean-libdispatch --skip-clean-foundation --cmake %cmake 2>&1 | %FileCheck --check-prefix=SKIP-CLEAN-CORELIBS-CHECK %s
13+
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --xctest --skip-clean-libdispatch --skip-clean-foundation --skip-clean-xctest --cmake %cmake 2>&1 | %FileCheck --check-prefix=SKIP-CLEAN-CORELIBS-CHECK %s
1414

1515
# CLEAN-CORELIBS-CHECK: Cleaning the libdispatch build directory
1616
# CLEAN-CORELIBS-CHECK-NEXT: rm -rf
1717
# CLEAN-CORELIBS-CHECK: Cleaning the Foundation build directory
1818
# CLEAN-CORELIBS-CHECK-NEXT: rm -rf
19+
# CLEAN-CORELIBS-CHECK: Cleaning the XCTest build directory
20+
# CLEAN-CORELIBS-CHECK-NEXT: rm -rf
1921

2022
# SKIP-CLEAN-CORELIBS-CHECK-NOT: Cleaning the libdispatch build directory
2123
# SKIP-CLEAN-CORELIBS-CHECK-NOT: rm -rf {{.*/libdispatch-[^/]*}}
2224
# SKIP-CLEAN-CORELIBS-CHECK-NOT: Cleaning the Foundation build directory
2325
# SKIP-CLEAN-CORELIBS-CHECK-NOT: rm -rf {{.*/foundation-[^/]*}}
26+
# SKIP-CLEAN-CORELIBS-CHECK-NOT: Cleaning the XCTest build directory
27+
# SKIP-CLEAN-CORELIBS-CHECK-NOT: rm -rf {{.*/xctest-[^/]*}}

validation-test/BuildSystem/skip_clean_xctest_llbuild.test renamed to validation-test/BuildSystem/skip_clean_llbuild.test

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22

33
# RUN: %empty-directory(%t)
44
# RUN: mkdir -p %t
5-
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --xctest --llbuild --cmake %cmake 2>&1 | %FileCheck --check-prefix=CLEAN-LLBUILD-CHECK %s
5+
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --llbuild --cmake %cmake 2>&1 | %FileCheck --check-prefix=CLEAN-LLBUILD-CHECK %s
66

77
# RUN: %empty-directory(%t)
88
# RUN: mkdir -p %t
9-
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --xctest --llbuild --skip-clean-xctest --skip-clean-llbuild --cmake %cmake 2>&1 | %FileCheck --check-prefix=SKIP-CLEAN-LLBUILD-CHECK %s
9+
# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --llbuild --skip-clean-llbuild --cmake %cmake 2>&1 | %FileCheck --check-prefix=SKIP-CLEAN-LLBUILD-CHECK %s
1010

11-
# CLEAN-LLBUILD-CHECK: Cleaning the XCTest build directory
12-
# CLEAN-LLBUILD-CHECK-NEXT: rm -rf
1311
# CLEAN-LLBUILD-CHECK: Cleaning the llbuild build directory
1412
# CLEAN-LLBUILD-CHECK-NEXT: rm -rf
1513

16-
# SKIP-CLEAN-LLBUILD-CHECK-NOT: Cleaning the XCTest build directory
17-
# SKIP-CLEAN-LLBUILD-CHECK-NOT: rm -rf {{.*/xctest-[^/]*}}
1814
# SKIP-CLEAN-LLBUILD-CHECK-NOT: Cleaning the llbuild build directory
1915
# SKIP-CLEAN-LLBUILD-CHECK-NOT: rm -rf {{.*/llbuild-[^/]*}}

0 commit comments

Comments
 (0)