From e1e151df0d948be7464b448c61033d4c1d80d86b Mon Sep 17 00:00:00 2001
From: Parzival-3141 <29632054+Parzival-3141@users.noreply.github.com>
Date: Mon, 26 Aug 2024 18:17:08 -0400
Subject: [PATCH] untangle skip conditions

---
 test/standalone/empty_env/build.zig | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/standalone/empty_env/build.zig b/test/standalone/empty_env/build.zig
index 9a707a7b98..dcbb0ad052 100644
--- a/test/standalone/empty_env/build.zig
+++ b/test/standalone/empty_env/build.zig
@@ -7,14 +7,15 @@ pub fn build(b: *std.Build) void {
 
     const optimize: std.builtin.OptimizeMode = .Debug;
 
-    if (builtin.os.tag == .windows and
-        // https://github.com/ziglang/zig/issues/13685
-        (builtin.cpu.arch == .aarch64 or
+    if (builtin.os.tag == .windows and std.process.hasEnvVarConstant("ConEmuHWND")) {
         // 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;
+    }
+
+    if (builtin.os.tag == .windows and builtin.cpu.arch == .aarch64) {
+        // https://github.com/ziglang/zig/issues/13685
         return;
     }