Skip to content

[Test] Don't test demangling of SwiftObject's name, as it's subject to change. #28286

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.

Sign up for GitHub

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
Nov 15, 2019
Merged

[Test] Don't test demangling of SwiftObject's name, as it's subject to change. #28286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions test/stdlib/Inputs/SwiftObjectNSObject/SwiftObjectNSObject.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,6 @@ void TestSwiftObjectNSObject(id c, id d)
expectTrue ([[c description] isEqual:@"SwiftObjectNSObject.C"]);
expectTrue ([[D description] isEqual:@"SwiftObjectNSObject.D"]);
expectTrue ([[C description] isEqual:@"SwiftObjectNSObject.C"]);
expectTrue ([[S description] isEqual:@(SwiftObjectDemangledName)]);
expectTrue ([[D_meta description] isEqual:@"SwiftObjectNSObject.D"]);
expectTrue ([[C_meta description] isEqual:@"SwiftObjectNSObject.C"]);
expectTrue ([[S_meta description] isEqual:@(SwiftObjectDemangledName)]);
Expand All @@ -430,7 +429,6 @@ void TestSwiftObjectNSObject(id c, id d)
expectTrue ([[c debugDescription] isEqual:@"SwiftObjectNSObject.C"]);
expectTrue ([[D debugDescription] isEqual:@"SwiftObjectNSObject.D"]);
expectTrue ([[C debugDescription] isEqual:@"SwiftObjectNSObject.C"]);
expectTrue ([[S debugDescription] isEqual:@(SwiftObjectDemangledName)]);
expectTrue ([[D_meta debugDescription] isEqual:@"SwiftObjectNSObject.D"]);
expectTrue ([[C_meta debugDescription] isEqual:@"SwiftObjectNSObject.C"]);
expectTrue ([[S_meta debugDescription] isEqual:@(SwiftObjectDemangledName)]);
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/SwiftObjectNSObject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func TestSwiftObjectNSObject(_ c: C, _ d: D)
// This check is for NSLog() output from TestSwiftObjectNSObject().
// CHECK: c ##SwiftObjectNSObject.C##
// CHECK-NEXT: d ##SwiftObjectNSObject.D##
// CHECK-NEXT: S ##{{(Swift._)?}}SwiftObject##
// CHECK-NEXT: S ##{{.*}}SwiftObject##

// Temporarily disable this test on older OSes until we have time to
// look into why it's failing there. rdar://problem/47870743
Expand Down