authorgravatar for 29632054+Parzival-3141@users.noreply.github.comParzival-3141 <29632054+Parzival-3141@users.noreply.github.com> 2024-08-26 18:17:08-04:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-08 23:34:20+02:00
loge1e151df0d948be7464b448c61033d4c1d80d86b
tree29fb1b0775508b938228e79687daaa8614bf4bc6
parent7dc0014769b0f55a351bb826bc3a456553d457cd

untangle skip conditions

1 files changed, 6 insertions(+), 5 deletions(-)

test/standalone/empty_env/build.zig+6-5
...@@ -7,14 +7,15 @@ pub fn build(b: *std.Build) void {...@@ -7,14 +7,15 @@ pub fn build(b: *std.Build) void {
77
8 const optimize: std.builtin.OptimizeMode = .Debug;8 const optimize: std.builtin.OptimizeMode = .Debug;
99
10 if (builtin.os.tag == .windows and10 if (builtin.os.tag == .windows and std.process.hasEnvVarConstant("ConEmuHWND")) {
11 // https://github.com/ziglang/zig/issues/13685
12 (builtin.cpu.arch == .aarch64 or
13 // ConEmu injects environment variables into processes before they are executed11 // ConEmu injects environment variables into processes before they are executed
14 // depending on user settings. This obviously invalidates the test, so skipping12 // depending on user settings. This obviously invalidates the test, so skipping
15 // it is the best option.13 // it is the best option.
16 std.process.hasEnvVarConstant("ConEmuHWND")))14 return;
17 {15 }
16
17 if (builtin.os.tag == .windows and builtin.cpu.arch == .aarch64) {
18 // https://github.com/ziglang/zig/issues/13685
18 return;19 return;
19 }20 }
2021