Commit 7dc0014769

Parzival-3141 <29632054+Parzival-3141@users.noreply.github.com>
2024-02-19 02:00:01
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 parent f522fb9
Changed files (1)
test
standalone
empty_env
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;
     }