Skip to content

Commit bea899d

Browse files
committed
android test fixes
1 parent 8b6767b commit bea899d

34 files changed

+77
-2
lines changed

test/AutoDiff/SILOptimizer/vjp_and_pullback_inlining.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import _Differentiation
1010
#if canImport(Glibc)
1111
import Glibc
12+
#elseif canImport(Android)
13+
import Android
1214
#else
1315
import Foundation
1416
#endif
@@ -112,4 +114,4 @@ func caller_of_more_complex_pb_with_control_flow() -> Float {
112114
}
113115

114116
// CHECK: decision {{{.*}}, b=70, {{.*}}} more_complex_pb_with_control_flowTJpSpSr
115-
// CHECK-NEXT: "more_complex_pb_with_control_flowTJpSpSr" inlined into "caller_of_more_complex_pb_with_control_flow"
117+
// CHECK-NEXT: "more_complex_pb_with_control_flowTJpSpSr" inlined into "caller_of_more_complex_pb_with_control_flow"

test/AutoDiff/compiler_crashers_fixed/issue-56600-symbol-in-ir-file-not-tbd-file.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import _Differentiation
1212
import Darwin
1313
#elseif canImport(Glibc)
1414
import Glibc
15+
#elseif canImport(Android)
16+
import Android
1517
#elseif os(Windows)
1618
import CRT
1719
#else

test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import Darwin.C.tgmath
66
#elseif canImport(Glibc)
77
import Glibc
8+
#elseif canImport(Android)
9+
import Android
810
#elseif os(Windows)
911
import CRT
1012
#else

test/AutoDiff/validation-test/custom_derivatives.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import StdlibUnittest
66
import Darwin.C
77
#elseif canImport(Glibc)
88
import Glibc
9+
#elseif canImport(Android)
10+
import Android
911
#elseif os(Windows)
1012
import CRT
1113
#else

test/AutoDiff/validation-test/separate_tangent_type.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import StdlibUnittest
66
import Darwin.C
77
#elseif canImport(Glibc)
88
import Glibc
9+
#elseif canImport(Android)
10+
import Android
911
#elseif os(Windows)
1012
import CRT
1113
#else

test/ClangImporter/clang_builtins.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import Darwin
55
#elseif canImport(Glibc)
66
import Glibc
7+
#elseif canImport(Android)
8+
import Android
79
#elseif os(WASI)
810
import WASILibc
911
#elseif os(Windows)

test/Concurrency/Runtime/async.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import StdlibUnittest
1616
import Darwin
1717
#elseif canImport(Glibc)
1818
import Glibc
19+
#elseif canImport(Android)
20+
import Android
1921
#endif
2022

2123
var asyncTests = TestSuite("Async")

test/Concurrency/Runtime/async_task_locals_copy_to_sync.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import Dispatch
1818
import Darwin
1919
#elseif canImport(Glibc)
2020
import Glibc
21+
#elseif canImport(Android)
22+
import Android
2123
#endif
2224

2325
enum TL {

test/Concurrency/Runtime/async_task_withUnsafeCurrentTask.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import Glibc
1111
#elseif os(Windows)
1212
import MSVCRT
13+
#elseif canImport(Android)
14+
import Android
1315
#else
1416
import Darwin
1517
#endif
@@ -36,4 +38,4 @@ func test_withUnsafeCurrentTask() async {
3638
static func main() async {
3739
await test_withUnsafeCurrentTask()
3840
}
39-
}
41+
}

test/Concurrency/Runtime/cancellation_handler.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import Darwin
1313
#elseif canImport(Glibc)
1414
import Glibc
15+
#elseif canImport(Android)
16+
import Android
1517
#elseif canImport(WASILibc)
1618
import WASILibc
1719
#elseif os(Windows)

test/Concurrency/Runtime/data_race_detection_crash.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import Dispatch
2424
import Darwin
2525
#elseif canImport(Glibc)
2626
import Glibc
27+
#elseif canImport(Android)
28+
import Android
2729
#endif
2830

2931
@MainActor func onMainActor() {

test/Concurrency/Runtime/data_race_detection_legacy_warning.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import Dispatch
2525
import Darwin
2626
#elseif canImport(Glibc)
2727
import Glibc
28+
#elseif canImport(Android)
29+
import Android
2830
#endif
2931

3032
@MainActor func onMainActor() {

test/Concurrency/Runtime/exclusivity.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ var global3: Int = 7
3131
import Darwin
3232
#elseif canImport(Glibc)
3333
import Glibc
34+
#elseif canImport(Android)
35+
import Android
3436
#elseif canImport(CRT)
3537
import CRT
3638
#endif

test/Concurrency/Runtime/exclusivity_custom_executors.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import StdlibUnittest
2626
import Darwin
2727
#elseif canImport(Glibc)
2828
import Glibc
29+
#elseif canImport(Android)
30+
import Android
2931
#elseif canImport(CRT)
3032
import CRT
3133
#endif

test/Concurrency/Runtime/executor_deinit3.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import Darwin
1515
#elseif canImport(Glibc)
1616
import Glibc
17+
#elseif canImport(Android)
18+
import Android
1719
#endif
1820

1921
@available(SwiftStdlib 5.1, *)

test/Concurrency/async_task_base_priority.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import Dispatch
2121
import Darwin
2222
#elseif canImport(Glibc)
2323
import Glibc
24+
#elseif canImport(Android)
25+
import Android
2426
#elseif os(WASI)
2527
import WASILibc
2628
#elseif os(Windows)

test/IRGen/builtin_math.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import Glibc
77
#elseif os(WASI)
88
import WASILibc
9+
#elseif os(Android)
10+
import Android
911
#elseif os(Windows)
1012
import CRT
1113
#else

test/IRGen/sanitize_coverage.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import Darwin
1616
#elseif canImport(Glibc)
1717
import Glibc
18+
#elseif canImport(Android)
19+
import Android
1820
#elseif os(Windows)
1921
import CRT
2022
#else

test/Interop/Cxx/libc/include-glibc.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
// REQUIRES: executable_test
44
// REQUIRES: OS=linux-gnu || OS=linux-android
55

6+
#if canImport(Glibc)
67
import Glibc
8+
#elseif canImport(Android)
9+
import Android
10+
#else
11+
#error ("unsupported platform")
12+
#endif
713
import StdlibUnittest
814

915
var GlibcTests = TestSuite("GlibcTests")

test/Interpreter/dynamicReplacement_property_observer.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import Darwin
1818
#elseif canImport(Glibc)
1919
import Glibc
20+
#elseif canImport(Android)
21+
import Android
2022
#elseif os(Windows)
2123
import CRT
2224
import WinSDK

test/Interpreter/dynamic_replacement.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ import StdlibUnittest
109109
import Darwin
110110
#elseif canImport(Glibc)
111111
import Glibc
112+
#elseif canImport(Android)
113+
import Android
112114
#elseif os(Windows)
113115
import CRT
114116
import WinSDK

test/Interpreter/dynamic_replacement_chaining.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import StdlibUnittest
3030
import Darwin
3131
#elseif canImport(Glibc)
3232
import Glibc
33+
#elseif canImport(Android)
34+
import Android
3335
#elseif os(Windows)
3436
import CRT
3537
import WinSDK

test/Interpreter/dynamic_replacement_without_previous_calls.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import StdlibUnittest
1616
import Darwin
1717
#elseif canImport(Glibc)
1818
import Glibc
19+
#elseif canImport(Android)
20+
import Android
1921
#elseif os(Windows)
2022
import CRT
2123
import WinSDK

test/Prototypes/BigInt.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import StdlibUnittest
2222
import Darwin
2323
#elseif canImport(Glibc)
2424
import Glibc
25+
#elseif canImport(Android)
26+
import Android
2527
#elseif os(Windows)
2628
import CRT
2729
#else

test/SILOptimizer/c_string_optimization.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import Darwin
1111
#elseif canImport(Glibc)
1212
import Glibc
13+
#elseif canImport(Android)
14+
import Android
1315
#elseif os(Windows)
1416
import CRT
1517
#else

test/multifile/protocol-conformance-redundant.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import StdlibUnittest
1717
import Darwin
1818
#elseif canImport(Glibc)
1919
import Glibc
20+
#elseif canImport(Android)
21+
import Android
2022
#else
2123
#error("Unsupported platform")
2224
#endif

test/stdlib/FloatConstants.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import Glibc
77
#elseif os(WASI)
88
import WASILibc
9+
#elseif os(Android)
10+
import Android
911
#elseif os(Windows)
1012
import CRT
1113
#else

test/stdlib/MathConstants.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import Glibc
77
#elseif os(WASI)
88
import WASILibc
9+
#elseif os(Android)
10+
import Android
911
#elseif os(Windows)
1012
import CRT
1113
#else

test/stdlib/POSIX.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import SwiftPrivateLibcExtras
99
import Darwin
1010
#elseif canImport(Glibc)
1111
import Glibc
12+
#elseif canImport(Android)
13+
import Android
1214
#else
1315
#error("Unsupported platform")
1416
#endif

test/stdlib/PrintFloat.swift.gyb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import SwiftPrivateLibcExtras
1919
import Glibc
2020
#elseif os(WASI)
2121
import WASILibc
22+
#elseif os(Android)
23+
import Android
2224
#elseif os(Windows)
2325
import CRT
2426
#else

test/stdlib/Runtime.swift.gyb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import SwiftShims
1717
import Glibc
1818
#elseif os(WASI)
1919
import WASILibc
20+
#elseif os(Android)
21+
import Android
2022
#elseif os(Windows)
2123
import CRT
2224
import WinSDK

test/stdlib/VarArgs.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ runAllTests()
2727
#elseif os(WASI)
2828
import WASILibc
2929
typealias CGFloat = Double
30+
#elseif canImport(Android)
31+
import Android
32+
typealias CGFloat = Double
3033
#elseif os(Windows)
3134
import CRT
3235
#if arch(x86_64) || arch(arm64)

test/stdlib/mmap.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ import StdlibUnittest
88
import Darwin
99
#elseif canImport(Glibc)
1010
import Glibc
11+
#elseif canImport(Android)
12+
import Android
13+
// MAP_FAILED is not available on android.
14+
let MAP_FAILED = UnsafeMutableRawPointer(bitPattern: -1)
1115
#else
1216
#error("Unsupported platform")
1317
#endif

test/stdlib/tgmath_optimized.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import Glibc
1111
#elseif os(WASI)
1212
import WASILibc
13+
#elseif os(Android)
14+
import Android
1315
#elseif os(Windows)
1416
import CRT
1517
#else

0 commit comments

Comments
 (0)