Merge pull request #17979 from milseman/4_2_nfc

najacque · web-flow · commit 5156b7c8a3ab · 2018-07-18T12:15:45.000-07:00
[test] Update String tests for older iOS versions
diff --git a/test/stdlib/StringBridge.swift b/test/stdlib/StringBridge.swift
@@ -34,6 +34,7 @@ func expectCocoa(_ str: String,
 }
 
 StringBridgeTests.test("Tagged NSString") {
+  guard #available(iOS 11.0, *) else { return }
 #if arch(i386) || arch(arm)
 #else
   // Bridge tagged strings as small
diff --git a/validation-test/stdlib/String.swift b/validation-test/stdlib/String.swift
@@ -912,6 +912,7 @@ StringTests.test("stringGutsReserve")
   .skip(.nativeRuntime("Foundation dependency"))
   .code {
 #if _runtime(_ObjC)
+  guard #available(iOS 11.0, *) else { return }
   for k in 0...7 {
     var base: String
     var startedNative: Bool

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ func expectCocoa(_ str: String,`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`StringBridgeTests.test("Tagged NSString") {`
	`37`	`+ guard #available(iOS 11.0, *) else { return }`
`37`	`38`	`#if arch(i386) \|\| arch(arm)`
`38`	`39`	`#else`
`39`	`40`	`// Bridge tagged strings as small`