File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
validation-test/BuildSystem Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -2351,7 +2351,7 @@ for host in "${ALL_HOSTS[@]}"; do
23512351 continue
23522352 fi
23532353
2354- if [[ " ${CROSS_COMPILE_BUILD_SWIFT_TOOLS} " == " 0 " ]]; then
2354+ if [[ " $( true_false $ {CROSS_COMPILE_BUILD_SWIFT_TOOLS}) " == " FALSE " ]]; then
23552355 echo " Skipping building Foundation Macros for ${host} , because the host tools are not being built"
23562356 continue
23572357 fi
@@ -2940,7 +2940,7 @@ for host in "${ALL_HOSTS[@]}"; do
29402940 continue
29412941 fi
29422942
2943- if [[ " ${CROSS_COMPILE_BUILD_SWIFT_TOOLS} " == " 0 " && " ${product} " == " foundation_macros" ]]; then
2943+ if [[ " $( true_false $ {CROSS_COMPILE_BUILD_SWIFT_TOOLS}) " == " FALSE " && " ${product} " == " foundation_macros" ]]; then
29442944 echo " Skipping installing Foundation Macros for ${host} , because the host tools are not being built"
29452945 continue
29462946 fi
Original file line number Diff line number Diff line change 11# REQUIRES: standalone_build
22
33# RUN: %empty-directory(%t)
4- # RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --cmake %cmake --swift-testing --swift-testing-macros --install-swift-testing-macros --install-llvm --cross-compile-hosts=android-aarch64 --cross-compile-build-swift-tools=False --android --android-ndk %t/ndk/ --android-arch aarch64 2>&1 | %FileCheck %s
4+ # RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --cmake %cmake --foundation -- swift-testing --swift-testing-macros --install-foundation --install-swift-testing-macros --install-llvm --cross-compile-hosts=android-aarch64 --cross-compile-build-swift-tools=False --android --android-ndk %t/ndk/ --android-arch aarch64 2>&1 | %FileCheck %s
55
66# CHECK: pushd {{.*}}/llvm-android-aarch64
77# CHECK-NOT: cmake --build {{.*}}/llvm-android-aarch64 --config
88# CHECK-NOT: cmake --build {{.*}}/llvm-android-aarch64 {{.*}} install-llvm
99# CHECK: cmake {{.*}}-DSWIFT_INCLUDE_TOOLS:BOOL=FALSE{{.*}}/swift
10+ # CHECK: Skipping building Foundation Macros for android-aarch64, because the host tools are not being built
11+ # CHECK: Skipping installing Foundation Macros for android-aarch64, because the host tools are not being built
1012# CHECK: Skipping building Testing Macros for android-aarch64, because the host tools are not being built
1113# CHECK: Skipping installing Testing Macros for android-aarch64, because the host tools are not being built
1214# CHECK: cmake {{.*}}-DCMAKE_TOOLCHAIN_FILE:PATH={{.*}}swifttesting-android-aarch64/BuildScriptToolchain.cmake
You can’t perform that action at this time.
0 commit comments