android test fixes

hyp · hyp · commit bea899d5106e · 2024-05-08T22:35:47.000-07:00
diff --git a/test/AutoDiff/SILOptimizer/vjp_and_pullback_inlining.swift b/test/AutoDiff/SILOptimizer/vjp_and_pullback_inlining.swift
@@ -9,6 +9,8 @@
 import _Differentiation
 #if canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #else
 import Foundation
 #endif
@@ -112,4 +114,4 @@ func caller_of_more_complex_pb_with_control_flow() -> Float {
 }
 
 // CHECK: decision {{{.*}}, b=70, {{.*}}} more_complex_pb_with_control_flowTJpSpSr
-// CHECK-NEXT: "more_complex_pb_with_control_flowTJpSpSr" inlined into "caller_of_more_complex_pb_with_control_flow"
+// CHECK-NEXT: "more_complex_pb_with_control_flowTJpSpSr" inlined into "caller_of_more_complex_pb_with_control_flow"
diff --git a/test/AutoDiff/compiler_crashers_fixed/issue-56600-symbol-in-ir-file-not-tbd-file.swift b/test/AutoDiff/compiler_crashers_fixed/issue-56600-symbol-in-ir-file-not-tbd-file.swift
@@ -12,6 +12,8 @@ import _Differentiation
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb b/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb
@@ -5,6 +5,8 @@
   import Darwin.C.tgmath
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/AutoDiff/validation-test/custom_derivatives.swift b/test/AutoDiff/validation-test/custom_derivatives.swift
@@ -6,6 +6,8 @@ import StdlibUnittest
   import Darwin.C
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/AutoDiff/validation-test/separate_tangent_type.swift b/test/AutoDiff/validation-test/separate_tangent_type.swift
@@ -6,6 +6,8 @@ import StdlibUnittest
   import Darwin.C
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/ClangImporter/clang_builtins.swift b/test/ClangImporter/clang_builtins.swift
@@ -4,6 +4,8 @@
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(WASI)
   import WASILibc
 #elseif os(Windows)
diff --git a/test/Concurrency/Runtime/async.swift b/test/Concurrency/Runtime/async.swift
@@ -16,6 +16,8 @@ import StdlibUnittest
     import Darwin
 #elseif canImport(Glibc)
     import Glibc
+#elseif canImport(Android)
+    import Android
 #endif
 
 var asyncTests = TestSuite("Async")
diff --git a/test/Concurrency/Runtime/async_task_locals_copy_to_sync.swift b/test/Concurrency/Runtime/async_task_locals_copy_to_sync.swift
@@ -18,6 +18,8 @@ import Dispatch
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #endif
 
 enum TL {
diff --git a/test/Concurrency/Runtime/async_task_withUnsafeCurrentTask.swift b/test/Concurrency/Runtime/async_task_withUnsafeCurrentTask.swift
@@ -10,6 +10,8 @@
 import Glibc
 #elseif os(Windows)
 import MSVCRT
+#elseif canImport(Android)
+import Android
 #else
 import Darwin
 #endif
@@ -36,4 +38,4 @@ func test_withUnsafeCurrentTask() async {
   static func main() async {
     await test_withUnsafeCurrentTask()
   }
-}
+}
diff --git a/test/Concurrency/Runtime/cancellation_handler.swift b/test/Concurrency/Runtime/cancellation_handler.swift
@@ -12,6 +12,8 @@
     import Darwin
 #elseif canImport(Glibc)
     import Glibc
+#elseif canImport(Android)
+    import Android
 #elseif canImport(WASILibc)
     import WASILibc
 #elseif os(Windows)
diff --git a/test/Concurrency/Runtime/data_race_detection_crash.swift b/test/Concurrency/Runtime/data_race_detection_crash.swift
@@ -24,6 +24,8 @@ import Dispatch
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #endif
 
 @MainActor func onMainActor() {
diff --git a/test/Concurrency/Runtime/data_race_detection_legacy_warning.swift b/test/Concurrency/Runtime/data_race_detection_legacy_warning.swift
@@ -25,6 +25,8 @@ import Dispatch
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #endif
 
 @MainActor func onMainActor() {
diff --git a/test/Concurrency/Runtime/exclusivity.swift b/test/Concurrency/Runtime/exclusivity.swift
@@ -31,6 +31,8 @@ var global3: Int = 7
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #elseif canImport(CRT)
 import CRT
 #endif
diff --git a/test/Concurrency/Runtime/exclusivity_custom_executors.swift b/test/Concurrency/Runtime/exclusivity_custom_executors.swift
@@ -26,6 +26,8 @@ import StdlibUnittest
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #elseif canImport(CRT)
 import CRT
 #endif
diff --git a/test/Concurrency/Runtime/executor_deinit3.swift b/test/Concurrency/Runtime/executor_deinit3.swift
@@ -14,6 +14,8 @@
     import Darwin
 #elseif canImport(Glibc)
     import Glibc
+#elseif canImport(Android)
+    import Android
 #endif
 
 @available(SwiftStdlib 5.1, *)
diff --git a/test/Concurrency/async_task_base_priority.swift b/test/Concurrency/async_task_base_priority.swift
@@ -21,6 +21,8 @@ import Dispatch
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #elseif os(WASI)
 import WASILibc
 #elseif os(Windows)
diff --git a/test/IRGen/builtin_math.swift b/test/IRGen/builtin_math.swift
@@ -6,6 +6,8 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
+#elseif os(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/IRGen/sanitize_coverage.swift b/test/IRGen/sanitize_coverage.swift
@@ -15,6 +15,8 @@
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/Interop/Cxx/libc/include-glibc.swift b/test/Interop/Cxx/libc/include-glibc.swift
@@ -3,7 +3,13 @@
 // REQUIRES: executable_test
 // REQUIRES: OS=linux-gnu || OS=linux-android
 
+#if canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
+#else
+#error ("unsupported platform")
+#endif
 import StdlibUnittest
 
 var GlibcTests = TestSuite("GlibcTests")
diff --git a/test/Interpreter/dynamicReplacement_property_observer.swift b/test/Interpreter/dynamicReplacement_property_observer.swift
@@ -17,6 +17,8 @@
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
   import WinSDK
diff --git a/test/Interpreter/dynamic_replacement.swift b/test/Interpreter/dynamic_replacement.swift
@@ -109,6 +109,8 @@ import StdlibUnittest
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
   import WinSDK
diff --git a/test/Interpreter/dynamic_replacement_chaining.swift b/test/Interpreter/dynamic_replacement_chaining.swift
@@ -30,6 +30,8 @@ import StdlibUnittest
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
   import WinSDK
diff --git a/test/Interpreter/dynamic_replacement_without_previous_calls.swift b/test/Interpreter/dynamic_replacement_without_previous_calls.swift
@@ -16,6 +16,8 @@ import StdlibUnittest
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
   import WinSDK
diff --git a/test/Prototypes/BigInt.swift b/test/Prototypes/BigInt.swift
@@ -22,6 +22,8 @@ import StdlibUnittest
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/SILOptimizer/c_string_optimization.swift b/test/SILOptimizer/c_string_optimization.swift
@@ -10,6 +10,8 @@
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/multifile/protocol-conformance-redundant.swift b/test/multifile/protocol-conformance-redundant.swift
@@ -17,6 +17,8 @@ import StdlibUnittest
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Android)
+import Android
 #else
 #error("Unsupported platform")
 #endif
diff --git a/test/stdlib/FloatConstants.swift b/test/stdlib/FloatConstants.swift
@@ -6,6 +6,8 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
+#elseif os(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/stdlib/MathConstants.swift b/test/stdlib/MathConstants.swift
@@ -6,6 +6,8 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
+#elseif os(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/stdlib/POSIX.swift b/test/stdlib/POSIX.swift
@@ -9,6 +9,8 @@ import SwiftPrivateLibcExtras
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
 #else
 #error("Unsupported platform")
 #endif
diff --git a/test/stdlib/PrintFloat.swift.gyb b/test/stdlib/PrintFloat.swift.gyb
@@ -19,6 +19,8 @@ import SwiftPrivateLibcExtras
   import Glibc
 #elseif os(WASI)
   import WASILibc
+#elseif os(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
diff --git a/test/stdlib/Runtime.swift.gyb b/test/stdlib/Runtime.swift.gyb
@@ -17,6 +17,8 @@ import SwiftShims
   import Glibc
 #elseif os(WASI)
   import WASILibc
+#elseif os(Android)
+  import Android
 #elseif os(Windows)
   import CRT
   import WinSDK
diff --git a/test/stdlib/VarArgs.swift b/test/stdlib/VarArgs.swift
@@ -27,6 +27,9 @@ runAllTests()
 #elseif os(WASI)
   import WASILibc
   typealias CGFloat = Double
+#elseif canImport(Android)
+  import Android
+  typealias CGFloat = Double
 #elseif os(Windows)
   import CRT
   #if arch(x86_64) || arch(arm64)
diff --git a/test/stdlib/mmap.swift b/test/stdlib/mmap.swift
@@ -8,6 +8,10 @@ import StdlibUnittest
   import Darwin
 #elseif canImport(Glibc)
   import Glibc
+#elseif canImport(Android)
+  import Android
+  // MAP_FAILED is not available on android.
+  let MAP_FAILED = UnsafeMutableRawPointer(bitPattern: -1)
 #else
 #error("Unsupported platform")
 #endif
diff --git a/test/stdlib/tgmath_optimized.swift b/test/stdlib/tgmath_optimized.swift
@@ -10,6 +10,8 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
+#elseif os(Android)
+  import Android
 #elseif os(Windows)
   import CRT
 #else
