Skip to content

Commit 1813cc3

Browse files
committed
[android] Enable some tests that should pass on Android.
Some tests are limited to only Linux, when they should also pass for Android. Additionally, InputStream.swift.gyb was disabled for Android ARMv7, but wasn't for Android AArch64, which allow me to find the error on it and fix it on swiftlang#24521. Finally, StringLowercasedUppercased is interesting in Android because it checks the used ICU is correct for performing the tasks that the stdlib needs.
1 parent 7311886 commit 1813cc3

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

test/Interpreter/conditional_conformances_modules.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// REQUIRES: executable_test
99
// FIXME: seems to fail on 32-bit simulator?
10-
// REQUIRES: OS=macosx || OS=linux
10+
// REQUIRES: OS=macosx || OS=linux-gnu || OS=linux-androideabi || OS=linux-android
1111

1212
import Basic
1313
import WithAssoc

test/stdlib/InputStream.swift.gyb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
// RUN: %target-run-simple-swiftgyb
1414
// REQUIRES: executable_test
1515

16-
// FIXME: The Android test runner is incapable of running this test, which
17-
// relies on stdin input.
18-
// UNSUPPORTED: OS=linux-androideabi
19-
2016
import StdlibUnittest
2117

2218

validation-test/stdlib/Glibc.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
// UNSUPPORTED: OS=ios
66
// UNSUPPORTED: OS=tvos
77
// UNSUPPORTED: OS=watchos
8-
// UNSUPPORTED: OS=linux-androideabi
98

10-
// REQUIRES: OS=linux-gnu
9+
// REQUIRES-ANY: OS=linux-gnu, OS=linux-androideabi, OS=linux-android
1110

1211
import Swift
1312
import StdlibUnittest

validation-test/stdlib/StringLowercasedUppercased.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// directly. It is not specific to Linux, it is just that on
66
// Apple platforms we are using the NSString bridge right now.
77

8-
// REQUIRES: OS=linux-gnu
8+
// REQUIRES-ANY: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
99

1010
import StdlibUnittest
1111

0 commit comments

Comments
 (0)