Merge pull request #20447 from milseman/linux_character

milseman · web-flow · commit 92d56cb47669 · 2018-11-08T16:23:28.000-08:00
[test] Disable new emoji testing on Linux
diff --git a/test/stdlib/Character.swift b/test/stdlib/Character.swift
@@ -106,6 +106,7 @@ testCharacters += [
 ]
 
 // Only run it on recent enough versions of ICU
+#if _runtime(_ObjC)
 if #available(iOS 11.0, macOS 10.13, tvOS 11.0, watchOS 4.0, *) {
   testCharacters += [
     "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 12 bytes
@@ -116,6 +117,7 @@ if #available(iOS 11.0, macOS 10.13, tvOS 11.0, watchOS 4.0, *) {
     "👩‍👩‍👦‍👦", // UTF-8: 25 bytes
   ]
 }
+#endif
 
 func randomGraphemeCluster(_ minSize: Int, _ maxSize: Int) -> String {
   let n = Int.random(in: (minSize + 1) ..< maxSize)

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ testCharacters += [`
`106`	`106`	`]`
`107`	`107`
`108`	`108`	`// Only run it on recent enough versions of ICU`
	`109`	`+#if _runtime(_ObjC)`
`109`	`110`	`if #available(iOS 11.0, macOS 10.13, tvOS 11.0, watchOS 4.0, *) {`
`110`	`111`	`testCharacters += [`
`111`	`112`	`"\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 12 bytes`
`@@ -116,6 +117,7 @@ if #available(iOS 11.0, macOS 10.13, tvOS 11.0, watchOS 4.0, *) {`
`116`	`117`	`"👩‍👩‍👦‍👦", // UTF-8: 25 bytes`
`117`	`118`	`]`
`118`	`119`	`}`
	`120`	`+#endif`
`119`	`121`
`120`	`122`	`func randomGraphemeCluster(_ minSize: Int, _ maxSize: Int) -> String {`
`121`	`123`	`let n = Int.random(in: (minSize + 1) ..< maxSize)`