Skip to content

Commit edb924f

Browse files
Merge pull request #24057 from apple/revert-24049-disable-stdlib-tests
Revert "Temporarily disable stdlib tests depending on autorelease elision."
2 parents f192b92 + 1e63ce7 commit edb924f

File tree

3 files changed

+7
-70
lines changed

3 files changed

+7
-70
lines changed

validation-test/stdlib/ArrayNew.swift.gyb

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

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 {
991+
ArrayTestSuite.test("BridgedToObjC/Custom/BridgeBack/Cast") {
1001992
let a = getBridgedNSArrayOfValueTypeCustomBridged(numElements: 3)
1002993

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

validation-test/stdlib/Dictionary.swift

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

32243224

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 {
3225+
DictionaryTestSuite.test("BridgedFromObjC.Verbatim.Generate_ParallelArray") {
32353226
autoreleasepoolIfUnoptimizedReturnAutoreleased {
32363227
// Add an autorelease pool because ParallelArrayDictionary autoreleases
32373228
// values in objectForKey.
@@ -4292,16 +4283,7 @@ DictionaryTestSuite.test("DictionaryUpcastBridged") {
42924283
// Dictionary downcasts
42934284
//===---
42944285

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 {
4286+
DictionaryTestSuite.test("DictionaryDowncastEntryPoint") {
43054287
var d = Dictionary<NSObject, AnyObject>(minimumCapacity: 32)
43064288
d[TestObjCKeyTy(10)] = TestObjCValueTy(1010)
43074289
d[TestObjCKeyTy(20)] = TestObjCValueTy(1020)
@@ -4322,16 +4304,7 @@ DictionaryTestSuite.test("DictionaryDowncastEntryPoint")
43224304
expectAutoreleasedKeysAndValues(unopt: (0, 3))
43234305
}
43244306

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 {
4307+
DictionaryTestSuite.test("DictionaryDowncast") {
43354308
var d = Dictionary<NSObject, AnyObject>(minimumCapacity: 32)
43364309
d[TestObjCKeyTy(10)] = TestObjCValueTy(1010)
43374310
d[TestObjCKeyTy(20)] = TestObjCValueTy(1020)

validation-test/stdlib/Set.swift

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

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 {
2649+
SetTestSuite.test("SetDowncastEntryPoint") {
26592650
var s = Set<NSObject>(minimumCapacity: 32)
26602651
for i in [1010, 2020, 3030] {
26612652
s.insert(TestObjCKeyTy(i))
@@ -2671,16 +2662,7 @@ SetTestSuite.test("SetDowncastEntryPoint")
26712662
expectAutoreleasedKeysAndValues(unopt: (3, 0))
26722663
}
26732664

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 {
2665+
SetTestSuite.test("SetDowncast") {
26842666
var s = Set<NSObject>(minimumCapacity: 32)
26852667
for i in [1010, 2020, 3030] {
26862668
s.insert(TestObjCKeyTy(i))
@@ -2756,16 +2738,7 @@ SetTestSuite.test("SetBridgeFromObjectiveCEntryPoint") {
27562738
}
27572739
}
27582740

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 {
2741+
SetTestSuite.test("SetBridgeFromObjectiveC") {
27692742
var s = Set<NSObject>(minimumCapacity: 32)
27702743
for i in [1010, 2020, 3030] {
27712744
s.insert(TestObjCKeyTy(i))

0 commit comments

Comments
 (0)