zig

commit e55fa3d525aeb72d0b8efec96daa84c32c38a1c5 (tree)
parent baa49e59294cb8a637eff7c0b3f07c523c91c18b
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Fri,  2 Jan 2026 22:49:02 -0800

fix two standalone tests on windows

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

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/standalone/empty_env/build.zig b/test/standalone/empty_env/build.zig
@@ -7,7 +7,7 @@ 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 b.graph.environ_map.contains("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.
diff --git a/test/standalone/windows_argv/build.zig b/test/standalone/windows_argv/build.zig
@@ -67,7 +67,7 @@ pub fn build(b: *std.Build) !void {
 
     // Only target the MSVC ABI if MSVC/Windows SDK is available
     const has_msvc = has_msvc: {
-        const sdk = std.zig.WindowsSdk.find(b.allocator, b.graph.io, builtin.cpu.arch) catch |err| switch (err) {
+        const sdk = std.zig.WindowsSdk.find(b.allocator, b.graph.io, builtin.cpu.arch, &b.graph.environ_map) catch |err| switch (err) {
             error.OutOfMemory => @panic("oom"),
             else => break :has_msvc false,
         };