Skip to content

Commit 8320cba

Browse files
authored
Merge pull request #84671 from ramonasuncion/test-stdlib-kvokeypaths-filecheck
[Test][stdlib] Update KVOKeyPaths.swift to use --check-prefixes
2 parents de14247 + 1c60000 commit 8320cba

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

test/stdlib/KVOKeyPaths.swift

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift %s -o %t/a.out
33
// RUN: %target-codesign %t/a.out
4-
// RUN: %target-run %t/a.out | grep 'check-prefix' > %t/prefix-option
5-
// RUN: %target-run %t/a.out | %FileCheck -check-prefix=CHECK `cat %t/prefix-option` %s
4+
// RUN: %target-run %t/a.out > %t/output.txt
5+
// RUN: %FileCheck %s < %t/output.txt
6+
// RUN: grep "check-prefix=CHECK-51" %t/output.txt && %FileCheck %s --check-prefix=CHECK-51 < %t/output.txt
67
// REQUIRES: executable_test
78

89
// REQUIRES: objc_interop
910

10-
// FIXME: https://github.com/apple/swift/issues/52252
11-
// Disable because it blocks PR testing.
12-
// UNSUPPORTED: CPU=i386
13-
1411
import Foundation
1512

1613
struct Guts {
@@ -126,10 +123,6 @@ print("target removed")
126123
// Swift 5.1 and later libraries.
127124
if #available(iOS 13, macOS 10.15, tvOS 13, watchOS 6, *) {
128125
print("-check-prefix=CHECK-51")
129-
} else {
130-
print("-check-prefix=DONT-CHECK")
131-
// Need at least one check, otherwise FileCheck will complain.
132-
// DONT-CHECK: {{.}}
133126
}
134127

135128
class Target2 : NSObject, NSKeyValueObservingCustomization {

0 commit comments

Comments
 (0)