authorgravatar for 29632054+Parzival-3141@users.noreply.github.comParzival-3141 <29632054+Parzival-3141@users.noreply.github.com> 2024-02-18 20:00:01-05:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-08 23:34:20+02:00
log7dc0014769b0f55a351bb826bc3a456553d457cd
treee272dcb494359e318f7d85b449578b7cdf9e52db
parentf522fb9ca3ae461df7682662293da96798dd6140

revert disabling `aarch64` skip

I was too optimistic in disabling the aarch64 skip, assuming it was also caused by ConEmu. Unfortunately I don't have access to a machine for testing.

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

test/standalone/empty_env/build.zig+5-1
...@@ -7,10 +7,14 @@ pub fn build(b: *std.Build) void {...@@ -7,10 +7,14 @@ 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 and std.process.hasEnvVarConstant("ConEmuHWND")) {10 if (builtin.os.tag == .windows and
11 // https://github.com/ziglang/zig/issues/13685
12 (builtin.cpu.arch == .aarch64 or
11 // ConEmu injects environment variables into processes before they are executed13 // ConEmu injects environment variables into processes before they are executed
12 // depending on user settings. This obviously invalidates the test, so skipping14 // depending on user settings. This obviously invalidates the test, so skipping
13 // it is the best option.15 // it is the best option.
16 std.process.hasEnvVarConstant("ConEmuHWND")))
17 {
14 return;18 return;
15 }19 }
1620