Skip to content

Commit 1991d0e

Browse files
gottesmmgottesmm
authored
Merge pull request swiftlang#11060 from gottesmm/disable_tests
Disable some failing tests while I look into a solution.
2 parents f2873ea + ab6a4f5 commit 1991d0e

24 files changed

+162
-32
lines changed

‎stdlib/private/StdlibUnittest/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
88
list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
99
endif()
1010

11+
if("${SWIFT_STDLIB_BUILD_TYPE}" STREQUAL "DebugAssert")
12+
list(APPEND swift_stdlib_unittest_compile_flags "-DSWIFT_STDLIB_DEBUG")
13+
endif()
14+
1115
# TODO: support this on non-POSIX platforms. It cannot be currently as it
1216
# depends on pthreads.
1317
add_swift_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB

‎stdlib/private/StdlibUnittest/StdlibCoreExtras.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,3 +245,11 @@ public func cartesianProduct<C1 : Collection, C2 : Collection>(
245245
return result
246246
}
247247

248+
/// Return true if the standard library was compiled in a debug configuration.
249+
public func _isStdlibDebugConfiguration() -> Bool {
250+
#if SWIFT_STDLIB_DEBUG
251+
return true
252+
#else
253+
return false
254+
#endif
255+
}

‎test/lit.site.cfg.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ if "@SWIFT_AST_VERIFIER@" == "TRUE":
6464

6565
if "@SWIFT_OPTIMIZED@" == "TRUE":
6666
config.available_features.add("optimized_stdlib")
67+
else:
68+
config.available_features.add("unoptimized_stdlib")
6769

6870
if "@SWIFT_STDLIB_ENABLE_RESILIENCE@" == "TRUE":
6971
config.available_features.add("resilient_stdlib")

‎test/stdlib/Inputs/CommonArrayTests.gyb

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ ${Suite}.test("${ArrayType}/Sliceable/Enums") {
101101
*/
102102
}
103103

104-
${Suite}.test("${ArrayType}/appendNonUnique") {
104+
${Suite}.test("${ArrayType}/appendNonUnique")
105+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${ArrayType}" == "ArraySlice"},
106+
reason: "rdar://33358110"))
107+
.code {
105108
var x: ${ArrayType}<Int> = []
106109
x.reserveCapacity(10002)
107110
let capacity = x.capacity
@@ -267,7 +270,10 @@ let withUnsafeMutableBufferPointerIfSupportedTests = [
267270
WithUnsafeMutableBufferPointerIfSupportedTest([ 10, 20, 30, 40, 50 ]),
268271
]
269272

270-
${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported") {
273+
${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported")
274+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${ArrayType}" == "ArraySlice"},
275+
reason: "rdar://33358110"))
276+
.code {
271277
for test in withUnsafeMutableBufferPointerIfSupportedTests {
272278
var a = getFresh${ArrayType}(test.sequence.map(OpaqueValue.init))
273279
do {
@@ -304,7 +310,10 @@ ${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported") {
304310
// FIXME: tests for arrays bridged from Objective-C.
305311
}
306312

307-
${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported/ReplacingTheBufferTraps/1") {
313+
${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported/ReplacingTheBufferTraps/1")
314+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${ArrayType}" == "ArraySlice"},
315+
reason: "rdar://33358110"))
316+
.code {
308317
var a = getFresh${ArrayType}([ OpaqueValue(10) ])
309318
var result = a._withUnsafeMutableBufferPointerIfSupported {
310319
(baseAddress, count) -> OpaqueValue<Int> in
@@ -315,7 +324,10 @@ ${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported/Replacing
315324
}
316325
}
317326

318-
${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported/ReplacingTheBufferTraps/2") {
327+
${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported/ReplacingTheBufferTraps/2")
328+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${ArrayType}" == "ArraySlice"},
329+
reason: "rdar://33358110"))
330+
.code {
319331
var a = getFresh${ArrayType}([ OpaqueValue(10) ])
320332
var result = a._withUnsafeMutableBufferPointerIfSupported {
321333
(baseAddress, count) -> OpaqueValue<Int> in
@@ -331,7 +343,10 @@ ${Suite}.test("${ArrayType}/_withUnsafeMutableBufferPointerIfSupported/Replacing
331343
//===----------------------------------------------------------------------===//
332344

333345
// Test the uniqueness of the raw buffer.
334-
${Suite}.test("${ArrayType}/withUnsafeMutableBytes") {
346+
${Suite}.test("${ArrayType}/withUnsafeMutableBytes")
347+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${ArrayType}" == "ArraySlice"},
348+
reason: "rdar://33358110"))
349+
.code {
335350
var a = getFresh${ArrayType}([UInt8](repeating: 10, count: 1))
336351
let b = a
337352
a.withUnsafeMutableBytes { bytes in
@@ -354,7 +369,10 @@ ${Suite}.test(
354369
}
355370

356371
${Suite}.test(
357-
"${ArrayType}/mutationDoesNotAffectIterator/subscript/append") {
372+
"${ArrayType}/mutationDoesNotAffectIterator/subscript/append")
373+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${ArrayType}" == "ArraySlice"},
374+
reason: "rdar://33358110"))
375+
.code {
358376
var arr: ${ArrayType}<Int> = [ 1010, 1020, 1030 ]
359377
var iter = arr.makeIterator()
360378
arr.append(1040)

‎validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_MutableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_MutableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_RangeReplaceableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_RangeReplaceableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ArraySlice_MutableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ArraySlice_MutableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ArraySlice_RangeReplaceableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ArraySlice_RangeReplaceableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/Array_MutableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/Array_MutableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/Array_RangeReplaceableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/Array_RangeReplaceableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ContiguousArray_MutableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ContiguousArray_MutableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ContiguousArray_RangeReplaceableRandomAccessCollectionRef.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/ContiguousArray_RangeReplaceableRandomAccessCollectionVal.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// RUN: %target-run-simple-swift
77
// REQUIRES: executable_test
8+
// UNSUPPORTED: unoptimized_stdlib
89

910
import StdlibUnittest
1011
import StdlibCollectionUnittest

‎validation-test/stdlib/Array/Inputs/ArrayConformanceTests.swift.gyb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
// RUN: %target-run-simple-swift
2727
// REQUIRES: executable_test
28+
// UNSUPPORTED: unoptimized_stdlib
2829

2930
import StdlibUnittest
3031
import StdlibCollectionUnittest

‎validation-test/stdlib/ArrayNew.swift.gyb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ func withInoutT<T>(_ x: inout T, body: (_ x: inout T) -> Void) {
4848
#if _runtime(_ObjC)
4949
% end
5050

51-
ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Int)/COW") {
51+
ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Int)/COW")
52+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${array_type}" == "ArraySlice" },
53+
reason: "rdar://33358110"))
54+
.code {
5255
var a: ${array_type}<${array_type}<${element_type}>> = [[
5356
${element_type}(10), ${element_type}(20), ${element_type}(30),
5457
${element_type}(40), ${element_type}(50), ${element_type}(60),
@@ -118,7 +121,10 @@ ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Int)/COW") {
118121
expectEqual(70, a[0][6].value)
119122
}
120123

121-
ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Range<Int>)/COW") {
124+
ArrayTestSuite.test("${array_type}<${element_type}>/subscript(_: Range<Int>)/COW")
125+
.xfail(.custom({ _isStdlibDebugConfiguration() && "${array_type}" == "ArraySlice" },
126+
reason: "rdar://33358110"))
127+
.code {
122128
var a: ${array_type}<${array_type}<${element_type}>> = [[
123129
${element_type}(10), ${element_type}(20), ${element_type}(30),
124130
${element_type}(40), ${element_type}(50), ${element_type}(60),

‎validation-test/stdlib/Dictionary.swift

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,10 @@ DictionaryTestSuite.test("COW.Slow.SubscriptWithIndexDoesNotReallocate") {
215215
}
216216

217217

218-
DictionaryTestSuite.test("COW.Fast.SubscriptWithKeyDoesNotReallocate") {
218+
DictionaryTestSuite.test("COW.Fast.SubscriptWithKeyDoesNotReallocate")
219+
.xfail(.custom({ _isStdlibDebugConfiguration() },
220+
reason: "rdar://33358110"))
221+
.code {
219222
var d = getCOWFastDictionary()
220223
var identity1 = d._rawIdentifier()
221224

@@ -269,7 +272,11 @@ DictionaryTestSuite.test("COW.Fast.SubscriptWithKeyDoesNotReallocate") {
269272
}
270273
}
271274

272-
DictionaryTestSuite.test("COW.Slow.SubscriptWithKeyDoesNotReallocate") {
275+
DictionaryTestSuite.test("COW.Slow.SubscriptWithKeyDoesNotReallocate")
276+
.xfail(.custom({ _isStdlibDebugConfiguration() },
277+
reason: "rdar://33358110"))
278+
.code {
279+
273280
var d = getCOWSlowDictionary()
274281
var identity1 = d._rawIdentifier()
275282

@@ -477,7 +484,11 @@ DictionaryTestSuite.test("COW.Slow.AddDoesNotReallocate") {
477484
}
478485
}
479486

480-
DictionaryTestSuite.test("COW.Fast.MergeSequenceDoesNotReallocate") {
487+
DictionaryTestSuite.test("COW.Fast.MergeSequenceDoesNotReallocate")
488+
.xfail(.custom({ _isStdlibDebugConfiguration() },
489+
reason: "rdar://33358110"))
490+
.code {
491+
481492
do {
482493
var d1 = getCOWFastDictionary()
483494
var identity1 = d1._rawIdentifier()
@@ -598,7 +609,11 @@ DictionaryTestSuite.test("COW.Fast.MergeSequenceDoesNotReallocate") {
598609
}
599610
}
600611

601-
DictionaryTestSuite.test("COW.Fast.MergeDictionaryDoesNotReallocate") {
612+
DictionaryTestSuite.test("COW.Fast.MergeDictionaryDoesNotReallocate")
613+
.xfail(.custom({ _isStdlibDebugConfiguration() },
614+
reason: "rdar://33358110"))
615+
.code {
616+
602617
do {
603618
var d1 = getCOWFastDictionary()
604619
var identity1 = d1._rawIdentifier()
@@ -865,7 +880,10 @@ DictionaryTestSuite.test("COW.Slow.IndexForKeyDoesNotReallocate") {
865880
}
866881

867882

868-
DictionaryTestSuite.test("COW.Fast.RemoveAtDoesNotReallocate") {
883+
DictionaryTestSuite.test("COW.Fast.RemoveAtDoesNotReallocate")
884+
.xfail(.custom({ _isStdlibDebugConfiguration() },
885+
reason: "rdar://33358110"))
886+
.code {
869887
do {
870888
var d = getCOWFastDictionary()
871889
var identity1 = d._rawIdentifier()
@@ -908,7 +926,10 @@ DictionaryTestSuite.test("COW.Fast.RemoveAtDoesNotReallocate") {
908926
}
909927
}
910928

911-
DictionaryTestSuite.test("COW.Slow.RemoveAtDoesNotReallocate") {
929+
DictionaryTestSuite.test("COW.Slow.RemoveAtDoesNotReallocate")
930+
.xfail(.custom({ _isStdlibDebugConfiguration() },
931+
reason: "rdar://33358110"))
932+
.code {
912933
do {
913934
var d = getCOWSlowDictionary()
914935
var identity1 = d._rawIdentifier()
@@ -950,7 +971,10 @@ DictionaryTestSuite.test("COW.Slow.RemoveAtDoesNotReallocate") {
950971
}
951972

952973

953-
DictionaryTestSuite.test("COW.Fast.RemoveValueForKeyDoesNotReallocate") {
974+
DictionaryTestSuite.test("COW.Fast.RemoveValueForKeyDoesNotReallocate")
975+
.xfail(.custom({ _isStdlibDebugConfiguration() },
976+
reason: "rdar://33358110"))
977+
.code {
954978
do {
955979
var d1 = getCOWFastDictionary()
956980
var identity1 = d1._rawIdentifier()
@@ -988,7 +1012,10 @@ DictionaryTestSuite.test("COW.Fast.RemoveValueForKeyDoesNotReallocate") {
9881012
}
9891013
}
9901014

991-
DictionaryTestSuite.test("COW.Slow.RemoveValueForKeyDoesNotReallocate") {
1015+
DictionaryTestSuite.test("COW.Slow.RemoveValueForKeyDoesNotReallocate")
1016+
.xfail(.custom({ _isStdlibDebugConfiguration() },
1017+
reason: "rdar://33358110"))
1018+
.code {
9921019
do {
9931020
var d1 = getCOWSlowDictionary()
9941021
var identity1 = d1._rawIdentifier()
@@ -2414,7 +2441,10 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.RemoveAt") {
24142441
assert(d.index(forKey: TestObjCKeyTy(10)) == nil)
24152442
}
24162443

2417-
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAt") {
2444+
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAt")
2445+
.xfail(.custom({ _isStdlibDebugConfiguration() },
2446+
reason: "rdar://33358110"))
2447+
.code {
24182448
var d = getBridgedNonverbatimDictionary()
24192449
var identity1 = d._rawIdentifier()
24202450
assert(isNativeDictionary(d))
@@ -2493,7 +2523,10 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.RemoveValueForKey") {
24932523
}
24942524
}
24952525

2496-
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveValueForKey") {
2526+
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveValueForKey")
2527+
.xfail(.custom({ _isStdlibDebugConfiguration() },
2528+
reason: "rdar://33358110"))
2529+
.code {
24972530
do {
24982531
var d = getBridgedNonverbatimDictionary()
24992532
var identity1 = d._rawIdentifier()

0 commit comments

Comments
 (0)