Skip to content

Commit f118cb3

Browse files
authored
Update swift-android-trunk-libdispatch.patch to disable two failing trunk tests on Android
1 parent dc380ce commit f118cb3

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

swift-android-trunk-libdispatch.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,30 @@ index 3f36fc979cb..8713ae8fea8 100755
1010
"grep",
1111
"--extended-regexp",
1212
"--recursive",
13+
diff --git a/swift/test/Reflection/conformance_descriptors.swift b/swift/test/Reflection/conformance_descriptors.swift
14+
index b114f764552..e1bd98c08f4 100644
15+
--- a/swift/test/Reflection/conformance_descriptors.swift
16+
+++ b/swift/test/Reflection/conformance_descriptors.swift
17+
@@ -5,6 +5,7 @@
18+
//
19+
// Temporarily disable on AArch64 Linux (rdar://88451721)
20+
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
21+
+// XFAIL: OS=linux-android
22+
23+
// rdar://100558042
24+
// UNSUPPORTED: CPU=arm64e
25+
diff --git a/swift/test/Reflection/typeref_decoding.swift b/swift/test/Reflection/typeref_decoding.swift
26+
index e0a3b4465a3..c01af893eda 100644
27+
--- a/swift/test/Reflection/typeref_decoding.swift
28+
+++ b/swift/test/Reflection/typeref_decoding.swift
29+
@@ -10,6 +10,7 @@
30+
31+
// FIXME: rdar://127796117
32+
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
33+
+// XFAIL: OS=linux-android
34+
35+
// RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift -parse-as-library -emit-module -emit-library %no-fixup-chains -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect)
36+
// RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift %S/Inputs/main.swift -emit-module -emit-executable %no-fixup-chains -module-name TypesToReflect -o %t/TypesToReflect
1337
diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
1438
index 3da519e..e2dd8ed 100644
1539
--- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake

0 commit comments

Comments
 (0)