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 @@ -2336,7 +2336,7 @@ for host in "${ALL_HOSTS[@]}"; do
2336
2336
continue
2337
2337
fi
2338
2338
2339
- if [[ " ${CROSS_COMPILE_BUILD_SWIFT_TOOLS} " == " 0 " ]]; then
2339
+ if [[ " $( true_false $ {CROSS_COMPILE_BUILD_SWIFT_TOOLS}) " == " FALSE " ]]; then
2340
2340
echo " Skipping building Foundation Macros for ${host} , because the host tools are not being built"
2341
2341
continue
2342
2342
fi
@@ -2925,7 +2925,7 @@ for host in "${ALL_HOSTS[@]}"; do
2925
2925
continue
2926
2926
fi
2927
2927
2928
- if [[ " ${CROSS_COMPILE_BUILD_SWIFT_TOOLS} " == " 0 " && " ${product} " == " foundation_macros" ]]; then
2928
+ if [[ " $( true_false $ {CROSS_COMPILE_BUILD_SWIFT_TOOLS}) " == " FALSE " && " ${product} " == " foundation_macros" ]]; then
2929
2929
echo " Skipping installing Foundation Macros for ${host} , because the host tools are not being built"
2930
2930
continue
2931
2931
fi
Original file line number Diff line number Diff line change 1
1
# REQUIRES: standalone_build
2
2
3
3
# 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
5
5
6
6
# CHECK: pushd {{.*}}/llvm-android-aarch64
7
7
# CHECK-NOT: cmake --build {{.*}}/llvm-android-aarch64 --config
8
8
# CHECK-NOT: cmake --build {{.*}}/llvm-android-aarch64 {{.*}} install-llvm
9
9
# 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
10
12
# CHECK: Skipping building Testing Macros for android-aarch64, because the host tools are not being built
11
13
# CHECK: Skipping installing Testing Macros for android-aarch64, because the host tools are not being built
12
14
# CHECK: cmake {{.*}}-DCMAKE_TOOLCHAIN_FILE:PATH={{.*}}swifttesting-android-aarch64/BuildScriptToolchain.cmake
You can’t perform that action at this time.
0 commit comments