Skip to content

Commit 9c55ad1

Browse files
committed
[stdlib] Enable ArrayNew.swift.gyb validation test on non-Darwin platforms
1 parent 8866f61 commit 9c55ad1

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

validation-test/stdlib/ArrayNew.swift.gyb

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@
22
// RUN: mkdir -p %t
33
//
44
// RUN: %S/../../utils/gyb %s -o %t/main.swift
5-
// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
6-
// 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
5+
// RUN: if [ %target-runtime == "objc" ]; then \
6+
// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
7+
// 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; \
8+
// RUN: else \
9+
// 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; \
10+
// RUN: fi
711
// RUN: %S/../../utils/line-directive %t/main.swift -- %target-run %t/Array
812
// REQUIRES: executable_test
913

10-
// XFAIL: linux
11-
12-
import Darwin
1314
import StdlibUnittest
1415
import StdlibCollectionUnittest
1516

1617

17-
import StdlibUnittestFoundationExtras
18-
import Foundation
19-
2018
%{
2119
all_array_types = ['ContiguousArray', 'ArraySlice', 'Array']
2220
}%
@@ -56,6 +54,9 @@ func withInoutT<T>(_ x: inout T, body: (x: inout T) -> Void) {
5654

5755
% for element_type in ['TestValueTy', 'TestBridgedValueTy']:
5856
% for array_type in all_array_types:
57+
% if element_type == 'TestBridgedValueTy':
58+
#if _runtime(_ObjC)
59+
% end
5960

6061
ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Int)/COW") {
6162
var a: ${array_type}<${array_type}<${element_type}>> = [[
@@ -225,9 +226,17 @@ ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Range<Int>)/COW
225226
expectEqual(90, a[0][8].value)
226227
}
227228

229+
% if element_type == 'TestBridgedValueTy':
230+
#endif // _runtime(_ObjC)
231+
% end
228232
% end
229233
% end
230234

235+
#if _runtime(_ObjC)
236+
import Darwin
237+
import StdlibUnittestFoundationExtras
238+
import Foundation
239+
231240
// FIXME: all the tests below are applicable to ArraySlice, too.
232241

233242
//===----------------------------------------------------------------------===//
@@ -1140,5 +1149,7 @@ ArrayTestSuite.tearDown {
11401149
}
11411150
}
11421151

1152+
#endif // _runtime(_ObjC)
1153+
11431154
runAllTests()
11441155

0 commit comments

Comments
 (0)