zig

commit 7dc0014769b0f55a351bb826bc3a456553d457cd (tree)
parent f522fb9ca3ae461df7682662293da96798dd6140
Author: Parzival-3141 <29632054+Parzival-3141@users.noreply.github.com>
Date:   Sun, 18 Feb 2024 20:00:01 -0500

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.

Diffstat:
M
test/standalone/empty_env/build.zig
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/standalone/empty_env/build.zig b/test/standalone/empty_env/build.zig
@@ -7,10 +7,14 @@ pub fn build(b: *std.Build) void {
 
     const optimize: std.builtin.OptimizeMode = .Debug;
 
-    if (builtin.os.tag == .windows and std.process.hasEnvVarConstant("ConEmuHWND")) {
+    if (builtin.os.tag == .windows and
+        // https://github.com/ziglang/zig/issues/13685
+        (builtin.cpu.arch == .aarch64 or
         // ConEmu injects environment variables into processes before they are executed
         // depending on user settings. This obviously invalidates the test, so skipping
         // it is the best option.
+        std.process.hasEnvVarConstant("ConEmuHWND")))
+    {
         return;
     }