Skip to content

Commit a99b374

Browse files
finagolfinhyp
authored andcommitted
[android] Update tests to use new Android overlay and disable stdlib/Glibc.swift
1 parent 95209ca commit a99b374

8 files changed

+15
-1
lines changed

validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import StdlibUnittest
1010
import Glibc
1111
#elseif os(Windows)
1212
import MSVCRT
13+
#elseif canImport(Android)
14+
import Android
1315
#else
1416
#error("Unsupported platform")
1517
#endif

validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import StdlibUnittest
88
import Glibc
99
#elseif os(Windows)
1010
import MSVCRT
11+
#elseif canImport(Android)
12+
import Android
1113
#else
1214
#error("Unsupported platform")
1315
#endif

validation-test/StdlibUnittest/ChildProcessShutdown/PassIfChildCrashedDuringTestExecution.swift

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import StdlibUnittest
88
import Glibc
99
#elseif os(Windows)
1010
import MSVCRT
11+
#elseif canImport(Android)
12+
import Android
1113
#else
1214
#error("Unsupported platform")
1315
#endif

validation-test/StdlibUnittest/ChildProcessShutdown/RequireOwnProcess.swift

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import StdlibUnittest
88
import Glibc
99
#elseif os(Windows)
1010
import MSVCRT
11+
#elseif canImport(Android)
12+
import Android
1113
#else
1214
#error("Unsupported platform")
1315
#endif

validation-test/StdlibUnittest/Stdin.swift

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import StdlibUnittest
1010
import Glibc
1111
#elseif os(Windows)
1212
import MSVCRT
13+
#elseif canImport(Android)
14+
import Android
1315
#else
1416
#error("Unsupported platform")
1517
#endif

validation-test/stdlib/Glibc.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// UNSUPPORTED: OS=tvos
77
// UNSUPPORTED: OS=watchos
88

9-
// REQUIRES: OS=linux-gnu || OS=linux-androideabi || OS=linux-android
9+
// REQUIRES: OS=linux-gnu
1010

1111
import Swift
1212
import StdlibUnittest

validation-test/stdlib/POSIXErrorCode.swift

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import StdlibUnittest
1010
import Darwin
1111
#elseif canImport(Glibc)
1212
import Glibc
13+
#elseif canImport(Android)
14+
import Android
1315
#else
1416
#error("Unsupported platform")
1517
#endif

validation-test/stdlib/String.swift

+2
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,8 @@ StringTests.test("Conversions") {
12351235

12361236
#if canImport(Glibc)
12371237
import Glibc
1238+
#elseif canImport(Android)
1239+
import Android
12381240
#endif
12391241

12401242
StringTests.test("lowercased()") {

0 commit comments

Comments
 (0)