Skip to content

Commit 5cfa1aa

Browse files
committed
Make the environment_variables test less flaky.
The test was inadvertently depending on the ordering of output between stderr and stdout, which makes it break particularly when being run remotely. rdar://88335113
1 parent 97eb38e commit 5cfa1aa

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

test/Runtime/environment_variables.swift

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
// UNSUPPORTED: use_os_stdlib
77
// UNSUPPORTED: back_deployment_runtime
88

9-
// RUN: env %env-SWIFT_DEBUG_HELP=YES %env-SWIFT_DEBUG_SOME_UNKNOWN_VARIABLE=42 %env-SWIFT_DEBUG_ENABLE_METADATA_ALLOCATION_ITERATION=YES %env-SWIFT_DEBUG_IMPLICIT_OBJC_ENTRYPOINT=abc %env-SWIFT_DETERMINISTIC_HASHING=whatever %env-SWIFT_ENABLE_MANGLED_NAME_VERIFICATION=YES %env-SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE=YES %target-run %t/main 2>&1 | %FileCheck %s --dump-input fail
9+
// RUN: env %env-SWIFT_DEBUG_HELP=YES %env-SWIFT_DEBUG_SOME_UNKNOWN_VARIABLE=42 %env-SWIFT_DEBUG_ENABLE_METADATA_ALLOCATION_ITERATION=YES %env-SWIFT_DEBUG_IMPLICIT_OBJC_ENTRYPOINT=abc %env-SWIFT_DETERMINISTIC_HASHING=whatever %env-SWIFT_ENABLE_MANGLED_NAME_VERIFICATION=YES %env-SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE=YES %target-run %t/main >%t.out 2>%t.err
10+
// RUN: cat %t.err %t.out | %FileCheck %s --dump-input fail
1011

1112
// CHECK-DAG: {{Warning: unknown environment variable SWIFT_DEBUG_SOME_UNKNOWN_VARIABLE|Using getenv to read variables. Unknown SWIFT_DEBUG_ variables will not be flagged.}}
1213
// CHECK-DAG: Warning: cannot parse value SWIFT_DEBUG_IMPLICIT_OBJC_ENTRYPOINT=abc, defaulting to 2.
@@ -18,5 +19,8 @@
1819
// CHECK-DAG: bool SWIFT_ENABLE_MANGLED_NAME_VERIFICATION [default: false] - Enable verification that metadata can roundtrip through a mangled name each time metadata is instantiated.
1920
// CHECK-DAG: bool SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE [default: false] - Scribble on runtime allocations such as metadata allocations.
2021

21-
print("Hello, world")
22+
// We need to do this because the DAG checks require a non-DAG check as an
23+
// anchor:
24+
2225
// CHECK: Hello, world
26+
print("\nHello, world\n")

0 commit comments

Comments
 (0)