Skip to content

Commit cde089c

Browse files
authored
Merge pull request #24049 from atrick/disable-stdlib-tests
Temporarily disable stdlib tests depending on autorelease elision.
2 parents a2d932d + bb8c5c6 commit cde089c

File tree

3 files changed

+70
-7
lines changed

3 files changed

+70
-7
lines changed

validation-test/stdlib/ArrayNew.swift.gyb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,16 @@ ArrayTestSuite.test("BridgedToObjC/Custom/ObjectEnumerator/FastEnumeration/UseFr
988988
expectEqual(3, TestBridgedValueTy.bridgeOperations)
989989
}
990990

991-
ArrayTestSuite.test("BridgedToObjC/Custom/BridgeBack/Cast") {
991+
ArrayTestSuite.test("BridgedToObjC/Custom/BridgeBack/Cast")
992+
.skip(.custom(
993+
{
994+
#if os(iOS)
995+
return true
996+
#else
997+
return false
998+
#endif
999+
}, reason: "Autorelease Failure. rdar://49791522"))
1000+
.code {
9921001
let a = getBridgedNSArrayOfValueTypeCustomBridged(numElements: 3)
9931002

9941003
var v: AnyObject = a[0] as AnyObject

validation-test/stdlib/Dictionary.swift

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3222,7 +3222,16 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.Generate_Huge") {
32223222
}
32233223

32243224

3225-
DictionaryTestSuite.test("BridgedFromObjC.Verbatim.Generate_ParallelArray") {
3225+
DictionaryTestSuite.test("BridgedFromObjC.Verbatim.Generate_ParallelArray")
3226+
.skip(.custom(
3227+
{
3228+
#if os(iOS)
3229+
return true
3230+
#else
3231+
return false
3232+
#endif
3233+
}, reason: "Autorelease Failure. rdar://49791522"))
3234+
.code {
32263235
autoreleasepoolIfUnoptimizedReturnAutoreleased {
32273236
// Add an autorelease pool because ParallelArrayDictionary autoreleases
32283237
// values in objectForKey.
@@ -4283,7 +4292,16 @@ DictionaryTestSuite.test("DictionaryUpcastBridged") {
42834292
// Dictionary downcasts
42844293
//===---
42854294

4286-
DictionaryTestSuite.test("DictionaryDowncastEntryPoint") {
4295+
DictionaryTestSuite.test("DictionaryDowncastEntryPoint")
4296+
.skip(.custom(
4297+
{
4298+
#if os(iOS)
4299+
return true
4300+
#else
4301+
return false
4302+
#endif
4303+
}, reason: "Autorelease Failure. rdar://49791522"))
4304+
.code {
42874305
var d = Dictionary<NSObject, AnyObject>(minimumCapacity: 32)
42884306
d[TestObjCKeyTy(10)] = TestObjCValueTy(1010)
42894307
d[TestObjCKeyTy(20)] = TestObjCValueTy(1020)
@@ -4304,7 +4322,16 @@ DictionaryTestSuite.test("DictionaryDowncastEntryPoint") {
43044322
expectAutoreleasedKeysAndValues(unopt: (0, 3))
43054323
}
43064324

4307-
DictionaryTestSuite.test("DictionaryDowncast") {
4325+
DictionaryTestSuite.test("DictionaryDowncast")
4326+
.skip(.custom(
4327+
{
4328+
#if os(iOS)
4329+
return true
4330+
#else
4331+
return false
4332+
#endif
4333+
}, reason: "Autorelease Failure. rdar://49791522"))
4334+
.code {
43084335
var d = Dictionary<NSObject, AnyObject>(minimumCapacity: 32)
43094336
d[TestObjCKeyTy(10)] = TestObjCValueTy(1010)
43104337
d[TestObjCKeyTy(20)] = TestObjCValueTy(1020)

validation-test/stdlib/Set.swift

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2646,7 +2646,16 @@ SetTestSuite.test("SetUpcastBridged") {
26462646
// Set downcasts
26472647
//
26482648

2649-
SetTestSuite.test("SetDowncastEntryPoint") {
2649+
SetTestSuite.test("SetDowncastEntryPoint")
2650+
.skip(.custom(
2651+
{
2652+
#if os(iOS)
2653+
return true
2654+
#else
2655+
return false
2656+
#endif
2657+
}, reason: "Autorelease Failure. rdar://49791522"))
2658+
.code {
26502659
var s = Set<NSObject>(minimumCapacity: 32)
26512660
for i in [1010, 2020, 3030] {
26522661
s.insert(TestObjCKeyTy(i))
@@ -2662,7 +2671,16 @@ SetTestSuite.test("SetDowncastEntryPoint") {
26622671
expectAutoreleasedKeysAndValues(unopt: (3, 0))
26632672
}
26642673

2665-
SetTestSuite.test("SetDowncast") {
2674+
SetTestSuite.test("SetDowncast")
2675+
.skip(.custom(
2676+
{
2677+
#if os(iOS)
2678+
return true
2679+
#else
2680+
return false
2681+
#endif
2682+
}, reason: "Autorelease Failure. rdar://49791522"))
2683+
.code {
26662684
var s = Set<NSObject>(minimumCapacity: 32)
26672685
for i in [1010, 2020, 3030] {
26682686
s.insert(TestObjCKeyTy(i))
@@ -2738,7 +2756,16 @@ SetTestSuite.test("SetBridgeFromObjectiveCEntryPoint") {
27382756
}
27392757
}
27402758

2741-
SetTestSuite.test("SetBridgeFromObjectiveC") {
2759+
SetTestSuite.test("SetBridgeFromObjectiveC")
2760+
.skip(.custom(
2761+
{
2762+
#if os(iOS)
2763+
return true
2764+
#else
2765+
return false
2766+
#endif
2767+
}, reason: "Autorelease Failure. rdar://49791522"))
2768+
.code {
27422769
var s = Set<NSObject>(minimumCapacity: 32)
27432770
for i in [1010, 2020, 3030] {
27442771
s.insert(TestObjCKeyTy(i))

0 commit comments

Comments
 (0)