Skip to content

Revert "Temporarily disable stdlib tests depending on autorelease elision." #24057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions validation-test/stdlib/ArrayNew.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -988,16 +988,7 @@ ArrayTestSuite.test("BridgedToObjC/Custom/ObjectEnumerator/FastEnumeration/UseFr
expectEqual(3, TestBridgedValueTy.bridgeOperations)
}

ArrayTestSuite.test("BridgedToObjC/Custom/BridgeBack/Cast")
.skip(.custom(
{
#if os(iOS)
return true
#else
return false
#endif
}, reason: "Autorelease Failure. rdar://49791522"))
.code {
ArrayTestSuite.test("BridgedToObjC/Custom/BridgeBack/Cast") {
let a = getBridgedNSArrayOfValueTypeCustomBridged(numElements: 3)

var v: AnyObject = a[0] as AnyObject
Expand Down
33 changes: 3 additions & 30 deletions validation-test/stdlib/Dictionary.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3222,16 +3222,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.Generate_Huge") {
}


DictionaryTestSuite.test("BridgedFromObjC.Verbatim.Generate_ParallelArray")
.skip(.custom(
{
#if os(iOS)
return true
#else
return false
#endif
}, reason: "Autorelease Failure. rdar://49791522"))
.code {
DictionaryTestSuite.test("BridgedFromObjC.Verbatim.Generate_ParallelArray") {
autoreleasepoolIfUnoptimizedReturnAutoreleased {
// Add an autorelease pool because ParallelArrayDictionary autoreleases
// values in objectForKey.
Expand Down Expand Up @@ -4292,16 +4283,7 @@ DictionaryTestSuite.test("DictionaryUpcastBridged") {
// Dictionary downcasts
//===---

DictionaryTestSuite.test("DictionaryDowncastEntryPoint")
.skip(.custom(
{
#if os(iOS)
return true
#else
return false
#endif
}, reason: "Autorelease Failure. rdar://49791522"))
.code {
DictionaryTestSuite.test("DictionaryDowncastEntryPoint") {
var d = Dictionary<NSObject, AnyObject>(minimumCapacity: 32)
d[TestObjCKeyTy(10)] = TestObjCValueTy(1010)
d[TestObjCKeyTy(20)] = TestObjCValueTy(1020)
Expand All @@ -4322,16 +4304,7 @@ DictionaryTestSuite.test("DictionaryDowncastEntryPoint")
expectAutoreleasedKeysAndValues(unopt: (0, 3))
}

DictionaryTestSuite.test("DictionaryDowncast")
.skip(.custom(
{
#if os(iOS)
return true
#else
return false
#endif
}, reason: "Autorelease Failure. rdar://49791522"))
.code {
DictionaryTestSuite.test("DictionaryDowncast") {
var d = Dictionary<NSObject, AnyObject>(minimumCapacity: 32)
d[TestObjCKeyTy(10)] = TestObjCValueTy(1010)
d[TestObjCKeyTy(20)] = TestObjCValueTy(1020)
Expand Down
33 changes: 3 additions & 30 deletions validation-test/stdlib/Set.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2646,16 +2646,7 @@ SetTestSuite.test("SetUpcastBridged") {
// Set downcasts
//

SetTestSuite.test("SetDowncastEntryPoint")
.skip(.custom(
{
#if os(iOS)
return true
#else
return false
#endif
}, reason: "Autorelease Failure. rdar://49791522"))
.code {
SetTestSuite.test("SetDowncastEntryPoint") {
var s = Set<NSObject>(minimumCapacity: 32)
for i in [1010, 2020, 3030] {
s.insert(TestObjCKeyTy(i))
Expand All @@ -2671,16 +2662,7 @@ SetTestSuite.test("SetDowncastEntryPoint")
expectAutoreleasedKeysAndValues(unopt: (3, 0))
}

SetTestSuite.test("SetDowncast")
.skip(.custom(
{
#if os(iOS)
return true
#else
return false
#endif
}, reason: "Autorelease Failure. rdar://49791522"))
.code {
SetTestSuite.test("SetDowncast") {
var s = Set<NSObject>(minimumCapacity: 32)
for i in [1010, 2020, 3030] {
s.insert(TestObjCKeyTy(i))
Expand Down Expand Up @@ -2756,16 +2738,7 @@ SetTestSuite.test("SetBridgeFromObjectiveCEntryPoint") {
}
}

SetTestSuite.test("SetBridgeFromObjectiveC")
.skip(.custom(
{
#if os(iOS)
return true
#else
return false
#endif
}, reason: "Autorelease Failure. rdar://49791522"))
.code {
SetTestSuite.test("SetBridgeFromObjectiveC") {
var s = Set<NSObject>(minimumCapacity: 32)
for i in [1010, 2020, 3030] {
s.insert(TestObjCKeyTy(i))
Expand Down