Merge pull request #38181 from buttaface/test-fix

shahmishal · web-flow · commit 849986380679 · 2021-06-30T15:27:04.000-07:00
[build] disable failing Android cross-compilation test on macOS
diff --git a/validation-test/BuildSystem/android_cross_compile.test b/validation-test/BuildSystem/android_cross_compile.test
@@ -1,4 +1,5 @@
 # REQUIRES: standalone_build
+# UNSUPPORTED: OS=macosx
 
 # RUN: %empty-directory(%t)
 # RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --cmake %cmake --libdispatch --cross-compile-hosts=android-aarch64 --skip-local-build --android --android-ndk %t/ndk/ --android-arch aarch64 --android-icu-uc %t/lib/libicuuc.so --android-icu-uc-include %t/include/ --android-icu-i18n %t/lib/libicui18n.so --android-icu-i18n-include %t/include/ --android-icu-data %t/lib/libicudata.so 2>&1 | %FileCheck %s

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# REQUIRES: standalone_build`
	`2`	`+# UNSUPPORTED: OS=macosx`
`2`	`3`
`3`	`4`	`# RUN: %empty-directory(%t)`
`4`	`5`	`# RUN: SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --cmake %cmake --libdispatch --cross-compile-hosts=android-aarch64 --skip-local-build --android --android-ndk %t/ndk/ --android-arch aarch64 --android-icu-uc %t/lib/libicuuc.so --android-icu-uc-include %t/include/ --android-icu-i18n %t/lib/libicui18n.so --android-icu-i18n-include %t/include/ --android-icu-data %t/lib/libicudata.so 2>&1 \| %FileCheck %s`