Skip to content

Commit 1066c82

Browse files
authored
Merge pull request #84930 from ramonasuncion/test-multifile-stderr-redirect
[Test][multifile] Replace process substitution with file redirect
2 parents d494a31 + d7fdebb commit 1066c82

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

test/multifile/protocol-conformance-redundant.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// RUN: %target-build-swift-dylib(%t/%target-library-name(Ext)) -module-name Ext -emit-module -emit-module-path %t/Ext.swiftmodule -I%t -L%t -lDef %S/Inputs/protocol-conformance-redundant-ext.swift
44
// RUN: %target-build-swift -I%t -L%t -lDef -o %t/main %target-rpath(%t) %s
55
// RUN: %target-codesign %t/main %t/%target-library-name(Def) %t/%target-library-name(Ext)
6-
// RUN: %target-run %t/main %t/%target-library-name(Def) %t/%target-library-name(Ext) 2> >(%FileCheck %s -check-prefix=CHECK-STDERR) | %FileCheck %s
6+
// RUN: %target-run %t/main %t/%target-library-name(Def) %t/%target-library-name(Ext) 2> %t/stderr.txt | %FileCheck %s
7+
// RUN: %FileCheck %s -check-prefix=CHECK-STDERR --input-file=%t/stderr.txt
78

89
// REQUIRES: executable_test
910
// XFAIL: OS=windows-msvc
@@ -43,7 +44,7 @@ extension GenericStruct: @retroactive Hello where T == String {
4344
}
4445
}
4546

46-
// CHECK-STDERR: Warning: 'main.GenericSubClass<Swift.String>' conforms to protocol 'Hello', but it also inherits conformance from 'Def.GenericSuperClass<Swift.String>'. Relying on a particular conformance is undefined behaviour.
47+
// CHECK-STDERR: Warning: 'main.GenericSubClass<Swift.{{Int|String}}>' conforms to protocol 'Hello', but it also inherits conformance from 'Def.GenericSuperClass<Swift.{{Int|String}}>'. Relying on a particular conformance is undefined behaviour.
4748
// CHECK: Hello from main
4849
(GenericStruct<String>() as Any as! Hello).hello()
4950

0 commit comments

Comments
 (0)