From cec3e112071b802dc3599b96c6559f29b360de6d Mon Sep 17 00:00:00 2001 From: Butta Date: Tue, 31 Aug 2021 21:04:20 +0530 Subject: [PATCH] [build][test] Don't test '--skip-clean-xctest' on Darwin as the source may not be checked out --- validation-test/BuildSystem/skip_clean_corelibs.test | 8 ++++++-- ..._clean_xctest_llbuild.test => skip_clean_llbuild.test} | 8 ++------ 2 files changed, 8 insertions(+), 8 deletions(-) rename validation-test/BuildSystem/{skip_clean_xctest_llbuild.test => skip_clean_llbuild.test} (50%) diff --git a/validation-test/BuildSystem/skip_clean_corelibs.test b/validation-test/BuildSystem/skip_clean_corelibs.test index 68aa5b268d79e..383d6c9372114 100644 --- a/validation-test/BuildSystem/skip_clean_corelibs.test +++ b/validation-test/BuildSystem/skip_clean_corelibs.test @@ -6,18 +6,22 @@ # RUN: %empty-directory(%t) # RUN: mkdir -p %t -# 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 +# 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 # RUN: %empty-directory(%t) # RUN: mkdir -p %t -# 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 +# 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 # CLEAN-CORELIBS-CHECK: Cleaning the libdispatch build directory # CLEAN-CORELIBS-CHECK-NEXT: rm -rf # CLEAN-CORELIBS-CHECK: Cleaning the Foundation build directory # CLEAN-CORELIBS-CHECK-NEXT: rm -rf +# CLEAN-CORELIBS-CHECK: Cleaning the XCTest build directory +# CLEAN-CORELIBS-CHECK-NEXT: rm -rf # SKIP-CLEAN-CORELIBS-CHECK-NOT: Cleaning the libdispatch build directory # SKIP-CLEAN-CORELIBS-CHECK-NOT: rm -rf {{.*/libdispatch-[^/]*}} # SKIP-CLEAN-CORELIBS-CHECK-NOT: Cleaning the Foundation build directory # SKIP-CLEAN-CORELIBS-CHECK-NOT: rm -rf {{.*/foundation-[^/]*}} +# SKIP-CLEAN-CORELIBS-CHECK-NOT: Cleaning the XCTest build directory +# SKIP-CLEAN-CORELIBS-CHECK-NOT: rm -rf {{.*/xctest-[^/]*}} diff --git a/validation-test/BuildSystem/skip_clean_xctest_llbuild.test b/validation-test/BuildSystem/skip_clean_llbuild.test similarity index 50% rename from validation-test/BuildSystem/skip_clean_xctest_llbuild.test rename to validation-test/BuildSystem/skip_clean_llbuild.test index 7a8dcfc106370..20af0a47c0357 100644 --- a/validation-test/BuildSystem/skip_clean_xctest_llbuild.test +++ b/validation-test/BuildSystem/skip_clean_llbuild.test @@ -2,18 +2,14 @@ # RUN: %empty-directory(%t) # RUN: mkdir -p %t -# 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 +# 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 # RUN: %empty-directory(%t) # RUN: mkdir -p %t -# 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 +# 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 -# CLEAN-LLBUILD-CHECK: Cleaning the XCTest build directory -# CLEAN-LLBUILD-CHECK-NEXT: rm -rf # CLEAN-LLBUILD-CHECK: Cleaning the llbuild build directory # CLEAN-LLBUILD-CHECK-NEXT: rm -rf -# SKIP-CLEAN-LLBUILD-CHECK-NOT: Cleaning the XCTest build directory -# SKIP-CLEAN-LLBUILD-CHECK-NOT: rm -rf {{.*/xctest-[^/]*}} # SKIP-CLEAN-LLBUILD-CHECK-NOT: Cleaning the llbuild build directory # SKIP-CLEAN-LLBUILD-CHECK-NOT: rm -rf {{.*/llbuild-[^/]*}}