Skip to content

Commit 24521a7

Browse files
committed
Merge remote-tracking branch 'origin/master' into master-next
2 parents 5db4e8d + cdda989 commit 24521a7

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

test/Interpreter/SDK/objc_getClass.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ testSuite.test("GenericMangled")
179179
reason: "objc_getClass hook not present"))
180180
.requireOwnProcess()
181181
.code {
182+
guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else { return }
182183
requireClass(named: "_TtC4main24ConstrainedSwiftSubclass",
183184
demangledName: "main.ConstrainedSwiftSubclass")
184185
requireClass(named: "_TtC4main26ConstrainedSwiftSuperclass",

validation-test/Reflection/inherits_ObjCClasses.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
// REQUIRES: objc_interop
1111
// REQUIRES: executable_test
12+
// REQUIRES: OS=macosx || OS=ios || OS=tvos
13+
// NOTE: Test is temporarily disabled for watchOS until we can figure out why
14+
// it's failing there. rdar://problem/50898688
1215

1316
import simd
1417
import ObjCClasses

0 commit comments

Comments
 (0)