update tests to use canImport(android) and make libc test for generalized

hyp · hyp · commit b5531e7b4877 · 2024-05-08T22:41:54.000-07:00
diff --git a/test/IRGen/builtin_math.swift b/test/IRGen/builtin_math.swift
@@ -6,7 +6,7 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
-#elseif os(Android)
+#elseif canImport(Android)
   import Android
 #elseif os(Windows)
   import CRT
diff --git a/test/Interop/Cxx/libc/include-libc.swift b/test/Interop/Cxx/libc/include-libc.swift
@@ -12,9 +12,9 @@ import Android
 #endif
 import StdlibUnittest
 
-var GlibcTests = TestSuite("GlibcTests")
+var LibcTests = TestSuite("LibcTests")
 
-GlibcTests.test("abs") {
+LibcTests.test("abs") {
   expectEqual(42, abs(-42))
 }
 
diff --git a/test/stdlib/FloatConstants.swift b/test/stdlib/FloatConstants.swift
@@ -6,7 +6,7 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
-#elseif os(Android)
+#elseif canImport(Android)
   import Android
 #elseif os(Windows)
   import CRT
diff --git a/test/stdlib/MathConstants.swift b/test/stdlib/MathConstants.swift
@@ -6,7 +6,7 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
-#elseif os(Android)
+#elseif CanImport(Android)
   import Android
 #elseif os(Windows)
   import CRT
diff --git a/test/stdlib/PrintFloat.swift.gyb b/test/stdlib/PrintFloat.swift.gyb
@@ -19,7 +19,7 @@ import SwiftPrivateLibcExtras
   import Glibc
 #elseif os(WASI)
   import WASILibc
-#elseif os(Android)
+#elseif canImport(Android)
   import Android
 #elseif os(Windows)
   import CRT
diff --git a/test/stdlib/Runtime.swift.gyb b/test/stdlib/Runtime.swift.gyb
@@ -17,7 +17,7 @@ import SwiftShims
   import Glibc
 #elseif os(WASI)
   import WASILibc
-#elseif os(Android)
+#elseif canImport(Android)
   import Android
 #elseif os(Windows)
   import CRT
diff --git a/test/stdlib/tgmath_optimized.swift b/test/stdlib/tgmath_optimized.swift
@@ -10,7 +10,7 @@
   import Glibc
 #elseif os(WASI)
   import WASILibc
-#elseif os(Android)
+#elseif canImport(Android)
   import Android
 #elseif os(Windows)
   import CRT

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import Android`
`12`	`12`	`#endif`
`13`	`13`	`import StdlibUnittest`
`14`	`14`
`15`		`-var GlibcTests = TestSuite("GlibcTests")`
	`15`	`+var LibcTests = TestSuite("LibcTests")`
`16`	`16`
`17`		`-GlibcTests.test("abs") {`
	`17`	`+LibcTests.test("abs") {`
`18`	`18`	`expectEqual(42, abs(-42))`
`19`	`19`	`}`
`20`	`20`