Merge pull request #2544 from rintaro/test-nondarwin-1

swift-ci · swift-ci · commit 9af514f9946a · 2016-05-16T21:30:10.000-07:00
diff --git a/test/1_stdlib/ManagedBuffer.swift b/test/1_stdlib/ManagedBuffer.swift
@@ -12,13 +12,12 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
-// FIXME: rdar://problem/19648117 Needs splitting objc parts out
-// XFAIL: linux
-
 import StdlibUnittest
 
 
+#if _runtime(_ObjC)
 import Foundation
+#endif
 
 // Check that `NonObjectiveCBase` can be subclassed and the subclass can be
 // created.
@@ -147,7 +146,7 @@ tests.test("basic") {
     let s = TestManagedBuffer<LifetimeTracked>.create(10)
     expectEqual(0, s.count)
     expectLE(10, s.myCapacity)
-    expectGE(12, s.myCapacity)  // allow some over-allocation but not too much
+    expectGE(13, s.myCapacity)  // allow some over-allocation but not too much
     
     expectEqual(1, LifetimeTracked.instances)
     for i in 1..<6 {
@@ -262,8 +261,10 @@ tests.test("isUniquelyReferencedNonObjC") {
   var s2 = s
   expectFalse(isUniquelyReferencedNonObjC(&s))
   expectFalse(isUniquelyReferencedNonObjC(&s2))
+#if _runtime(_ObjC)
   var s3 = NSArray()
   expectFalse(isUniquelyReferencedNonObjC(&s3))
+#endif
   _fixLifetime(s)
   _fixLifetime(s2)
 }
diff --git a/test/1_stdlib/Mirror.swift b/test/1_stdlib/Mirror.swift
@@ -12,13 +12,16 @@
 // RUN: rm -rf %t
 // RUN: mkdir -p %t
 //
-// RUN: %target-clang %S/Inputs/Mirror/Mirror.mm -c -o %t/Mirror.mm.o -g
-// RUN: %target-build-swift %s -I %S/Inputs/Mirror/ -Xlinker %t/Mirror.mm.o -o %t/Mirror
+// RUN: if [ %target-runtime == "objc" ]; \
+// RUN: then \
+// RUN:   %target-clang %S/Inputs/Mirror/Mirror.mm -c -o %t/Mirror.mm.o -g && \
+// RUN:   %target-build-swift %s -I %S/Inputs/Mirror/ -Xlinker %t/Mirror.mm.o -o %t/Mirror; \
+// RUN: else \
+// RUN:   %target-build-swift %s -o %t/Mirror; \
+// RUN: fi
 // RUN: %target-run %t/Mirror
 // REQUIRES: executable_test
 
-// XFAIL: linux
-
 import StdlibUnittest
 
 
@@ -354,6 +357,7 @@ mirrors.test("class/CustomizedSuper/Synthesized") {
   }
 }
 
+#if _runtime(_ObjC)
 import Foundation
 
 //===--- ObjC Base Classes ------------------------------------------------===//
@@ -461,6 +465,7 @@ mirrors.test("class/ObjCCustomizedSuper/Synthesized") {
     }
   }
 }
+#endif // _runtime(_ObjC)
 
 //===--- Suppressed Superclass Mirrors ------------------------------------===//
 mirrors.test("Class/Root/NoSuperclassMirror") {
@@ -717,7 +722,10 @@ mirrors.test("PlaygroundQuickLook") {
   struct X {}
   switch PlaygroundQuickLook(reflecting: X()) {
   case .text(let text):
+#if _runtime(_ObjC)
+// FIXME: Enable if non-objc hasSuffix is implemented.
     expectTrue(text.hasSuffix(".(X #1)()"), text)
+#endif
   default:
     expectTrue(false)
   }
@@ -759,13 +767,15 @@ mirrors.test("_DefaultCustomPlaygroundQuickLookable") {
   }
 }
 
+#if _runtime(_ObjC)
 import MirrorObjC
 mirrors.test("ObjC") {
   // Some Foundation classes lie about their ivars, which would crash
   // a mirror; make sure we are not automatically exposing ivars of
   // Objective-C classes from the default mirror implementation.
   expectEqual(0, Mirror(reflecting: HasIVars()).children.count)
 }
+#endif
 
 mirrors.test("String.init") {
   expectEqual("42", String(42))
diff --git a/test/Interpreter/SDK/libc.swift b/test/Interpreter/SDK/libc.swift
@@ -5,9 +5,11 @@
 // RUN: %target-run-simple-swift %s %t | FileCheck %s
 // REQUIRES: executable_test
 
-// XFAIL: linux
-
-import Darwin
+#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+  import Darwin
+#elseif os(Linux) || os(FreeBSD) || os(Android)
+  import Glibc
+#endif
 
 let sourcePath = Process.arguments[1]
 let tempPath = Process.arguments[2] + "/libc.txt"
diff --git a/validation-test/stdlib/ArrayNew.swift.gyb b/validation-test/stdlib/ArrayNew.swift.gyb
@@ -2,21 +2,19 @@
 // RUN: mkdir -p %t
 //
 // RUN: %S/../../utils/gyb %s -o %t/main.swift
-// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
-// RUN: %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Array -Xfrontend -disable-access-control
+// RUN: if [ %target-runtime == "objc" ]; then \
+// RUN:   %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
+// RUN:   %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Array -Xfrontend -disable-access-control; \
+// RUN: else \
+// RUN:   %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %t/main.swift -o %t/Array -Xfrontend -disable-objc-attr-requires-foundation-module -Xfrontend -disable-access-control; \
+// RUN: fi
 // RUN: %S/../../utils/line-directive %t/main.swift -- %target-run %t/Array
 // REQUIRES: executable_test
 
-// XFAIL: linux
-
-import Darwin
 import StdlibUnittest
 import StdlibCollectionUnittest
 
 
-import StdlibUnittestFoundationExtras
-import Foundation
-
 %{
 all_array_types = ['ContiguousArray', 'ArraySlice', 'Array']
 }%
@@ -56,6 +54,9 @@ func withInoutT<T>(_ x: inout T, body: (x: inout T) -> Void) {
 
 % for element_type in ['TestValueTy', 'TestBridgedValueTy']:
 %   for array_type in all_array_types:
+%     if element_type == 'TestBridgedValueTy':
+#if _runtime(_ObjC)
+%     end
 
 ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Int)/COW") {
   var a: ${array_type}<${array_type}<${element_type}>> = [[
@@ -225,9 +226,17 @@ ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Range<Int>)/COW
   expectEqual(90, a[0][8].value)
 }
 
+%     if element_type == 'TestBridgedValueTy':
+#endif // _runtime(_ObjC)
+%     end
 %   end
 % end
 
+#if _runtime(_ObjC)
+import Darwin
+import StdlibUnittestFoundationExtras
+import Foundation
+
 // FIXME: all the tests below are applicable to ArraySlice, too.
 
 //===----------------------------------------------------------------------===//
@@ -1140,5 +1149,7 @@ ArrayTestSuite.tearDown {
   }
 }
 
+#endif // _runtime(_ObjC)
+
 runAllTests()
 
diff --git a/validation-test/stdlib/Dictionary.swift b/validation-test/stdlib/Dictionary.swift
@@ -2,21 +2,30 @@
 // RUN: mkdir -p %t
 //
 // RUN: %S/../../utils/gyb %s -o %t/main.swift
-// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
-// RUN: %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Dictionary -Xfrontend -disable-access-control
+// RUN: if [ %target-runtime == "objc" ]; then \
+// RUN:   %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
+// RUN:   %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Dictionary -Xfrontend -disable-access-control; \
+// RUN: else \
+// RUN:   %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %t/main.swift -o %t/Dictionary -Xfrontend -disable-access-control -Xfrontend -disable-objc-attr-requires-foundation-module; \
+// RUN: fi
 //
 // RUN: %S/../../utils/line-directive %t/main.swift -- %target-run %t/Dictionary
 // REQUIRES: executable_test
 
-// XFAIL: linux
-
+#if os(OSX) || os(iOS) || os(tvOS) || os(watchOS)
 import Darwin
+#else
+import Glibc
+#endif
+
 import StdlibUnittest
 import StdlibCollectionUnittest
 
 
+#if _runtime(_ObjC)
 import Foundation
 import StdlibUnittestFoundationExtras
+#endif
 
 // Check that the generic parameters are called 'Key' and 'Value'.
 protocol TestProtocol1 {}
@@ -1142,6 +1151,7 @@ DictionaryTestSuite.test("init(dictionaryLiteral:)") {
   }
 }
 
+#if _runtime(_ObjC)
 //===---
 // NSDictionary -> Dictionary bridging tests.
 //===---
@@ -3410,6 +3420,7 @@ DictionaryTestSuite.test("DictionaryBridgeFromObjectiveCConditional") {
     assert(false)
   }
 }
+#endif // _runtime(_ObjC)
 
 //===---
 // Tests for APIs implemented strictly based on public interface.  We only need
@@ -3426,6 +3437,18 @@ func getDerivedAPIsDictionary() -> Dictionary<Int, Int> {
 
 var DictionaryDerivedAPIs = TestSuite("DictionaryDerivedAPIs")
 
+DictionaryDerivedAPIs.test("isEmpty") {
+  do {
+    var empty = Dictionary<Int, Int>()
+    expectTrue(empty.isEmpty)
+  }
+  do {
+    var d = getDerivedAPIsDictionary()
+    expectFalse(d.isEmpty)
+  }
+}
+
+#if _runtime(_ObjC)
 @objc
 class MockDictionaryWithCustomCount : NSDictionary {
   init(count: Int) {
@@ -3478,17 +3501,6 @@ func getMockDictionaryWithCustomCount(count: Int)
   return MockDictionaryWithCustomCount(count: count) as Dictionary
 }
 
-DictionaryDerivedAPIs.test("isEmpty") {
-  do {
-    var empty = Dictionary<Int, Int>()
-    expectTrue(empty.isEmpty)
-  }
-  do {
-    var d = getDerivedAPIsDictionary()
-    expectFalse(d.isEmpty)
-  }
-}
-
 func callGenericIsEmpty<C : Collection>(_ collection: C) -> Bool {
   return collection.isEmpty
 }
@@ -3520,6 +3532,7 @@ DictionaryDerivedAPIs.test("isEmpty/ImplementationIsCustomized") {
     expectEqual(1, MockDictionaryWithCustomCount.timesCountWasCalled)
   }
 }
+#endif // _runtime(_ObjC)
 
 DictionaryDerivedAPIs.test("keys") {
   do {
@@ -3552,6 +3565,7 @@ DictionaryDerivedAPIs.test("values") {
   }
 }
 
+#if _runtime(_ObjC)
 var ObjCThunks = TestSuite("ObjCThunks")
 
 class ObjCThunksHelper : NSObject {
@@ -3695,6 +3709,7 @@ ObjCThunks.test("Dictionary/Return") {
     expectEqual(0, TestBridgedValueTy.bridgeOperations)
   }
 }
+#endif // _runtime(_ObjC)
 
 //===---
 // Check that iterators traverse a snapshot of the collection.
@@ -3822,6 +3837,7 @@ DictionaryTestSuite.test("misc") {
   }
 }
 
+#if _runtime(_ObjC)
 DictionaryTestSuite.test("dropsBridgedCache") {
   // rdar://problem/18544533
   // Previously this code would segfault due to a double free in the Dictionary
@@ -3861,6 +3877,7 @@ DictionaryTestSuite.test("getObjects:andKeys:") {
   expectEqual([2, 1] as [NSNumber], Array(keys))
   expectEqual(["two", "one"] as [NSString], Array(values))
 }
+#endif
 
 DictionaryTestSuite.test("popFirst") {
   // Empty
@@ -3909,12 +3926,16 @@ DictionaryTestSuite.test("removeAt") {
 
 DictionaryTestSuite.setUp {
   resetLeaksOfDictionaryKeysValues()
+#if _runtime(_ObjC)
   resetLeaksOfObjCDictionaryKeysValues()
+#endif
 }
 
 DictionaryTestSuite.tearDown {
   expectNoLeaksOfDictionaryKeysValues()
+#if _runtime(_ObjC)
   expectNoLeaksOfObjCDictionaryKeysValues()
+#endif
 }
 
 runAllTests()
diff --git a/validation-test/stdlib/Unicode.swift b/validation-test/stdlib/Unicode.swift
@@ -1,16 +1,14 @@
-// RUN: %target-run-simple-swift
+// RUN: rm -rf %t
+// RUN: mkdir -p %t
+// RUN: %target-build-swift %s -o %t/a.out -Xfrontend -disable-objc-attr-requires-foundation-module
+// RUN: %target-run %t/a.out
 // REQUIRES: executable_test
 
-// FIXME: rdar://problem/19648117 Needs splitting objc parts out
-// XFAIL: linux
-
 import SwiftPrivate
 import StdlibUnittest
 import StdlibCollectionUnittest
 
 
-import Foundation
-
 var UTF16APIs = TestSuite("UTF16APIs")
 
 UTF16APIs.test("width") {
@@ -816,7 +814,7 @@ UTF8Decoder.test("Internal/_decodeOne") {
   var validLengthCounts = [ 0, 0, 0, 0, 0 ]
   var maximalSubpartCounts = [ 0, 0, 0, 0, 0 ]
   func countValidSequences(
-    head head: CountableClosedRange<UInt32>, tail: CountableClosedRange<UInt32>
+    head: CountableClosedRange<UInt32>, tail: CountableClosedRange<UInt32>
   ) {
     for cu0 in head {
       for rest in tail {
@@ -2157,6 +2155,9 @@ UnicodeAPIs.test("transcode/ReferenceTypedArray") {
   expectEqual(input, transcoded)
 }
 
+#if _runtime(_ObjC)
+import Foundation
+
 // The most simple subclass of NSString that CoreFoundation does not know
 // about.
 class NonContiguousNSString : NSString {
@@ -2461,5 +2462,7 @@ StringTests.test("StreamableConformance") {
   }
 }
 
+#endif // _runtime(_ObjC)
+
 runAllTests()
 
