zwin32: change test to comptime check

hazeycode · hazeycode · commit 0b5a8c9a9637 · 2024-08-25T14:28:22.000+01:00
Also cleanup of redundent specification of dependency target option
diff --git a/build.zig b/build.zig
@@ -83,9 +83,6 @@ pub fn build(b: *std.Build) void {
         { // Tests
             const test_step = b.step("test", "Run all tests");
             tests(b, target, optimize, test_step);
-            if (builtin.os.tag == .windows) {
-                testsWindows(b, target, optimize, test_step);
-            }
         }
 
         { // Benchmarks
@@ -308,19 +305,6 @@ fn tests(
     test_step.dependOn(&b.addRunArtifact(ztracy.artifact("ztracy-tests")).step);
 }
 
-fn testsWindows(
-    b: *std.Build,
-    target: std.Build.ResolvedTarget,
-    optimize: std.builtin.OptimizeMode,
-    test_step: *std.Build.Step,
-) void {
-    const zwin32 = b.dependency("zwin32", .{
-        .target = target,
-        .optimize = optimize,
-    });
-    test_step.dependOn(&b.addRunArtifact(zwin32.artifact("zwin32-tests")).step);
-}
-
 // TODO: Delete this once Zig checks minimum_zig_version in build.zig.zon
 fn ensureZigVersion() !void {
     var installed_ver = builtin.zig_version;
diff --git a/libs/zd3d12/build.zig b/libs/zd3d12/build.zig
@@ -3,8 +3,6 @@ const std = @import("std");
 const default_upload_heap_capacity: u32 = 32 * 1024 * 1024;
 
 pub fn build(b: *std.Build) void {
-    const target = b.standardTargetOptions(.{});
-
     const options = .{
         .debug_layer = b.option(
             bool,
@@ -31,9 +29,7 @@ pub fn build(b: *std.Build) void {
 
     const options_module = options_step.createModule();
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
 
     _ = b.addModule("root", .{
diff --git a/libs/zopenvr/build.zig b/libs/zopenvr/build.zig
@@ -1,11 +1,7 @@
 const std = @import("std");
 
 pub fn build(b: *std.Build) void {
-    const target = b.standardTargetOptions(.{});
-
-    const zwin32 = b.dependency("zwin32", .{
-        .target = target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     _ = b.addModule("root", .{
         .root_source_file = b.path("src/openvr.zig"),
         .imports = &.{
diff --git a/libs/zwin32/build.zig b/libs/zwin32/build.zig
@@ -2,25 +2,9 @@ const std = @import("std");
 const builtin = @import("builtin");
 
 pub fn build(b: *std.Build) !void {
-    const optimize = b.standardOptimizeOption(.{});
-    const target = b.standardTargetOptions(.{});
-
     _ = b.addModule("root", .{
         .root_source_file = b.path("src/zwin32.zig"),
     });
-
-    const test_step = b.step("test", "Run zwin32 tests");
-
-    const tests = b.addTest(.{
-        .name = "zwin32-tests",
-        .root_source_file = b.path("src/zwin32.zig"),
-        .target = target,
-        .optimize = optimize,
-    });
-
-    b.installArtifact(tests);
-
-    test_step.dependOn(&b.addRunArtifact(tests).step);
 }
 
 pub fn install_xaudio2(
diff --git a/libs/zwin32/src/zwin32.zig b/libs/zwin32/src/zwin32.zig
@@ -19,7 +19,7 @@ pub const xinput = @import("xinput.zig");
 pub const dds_loader = @import("dds_loader.zig");
 pub const d3dcompiler = @import("d3dcompiler.zig");
 
-test {
+comptime {
     std.testing.refAllDeclsRecursive(@This());
 }
 
diff --git a/libs/zxaudio2/build.zig b/libs/zxaudio2/build.zig
@@ -14,9 +14,7 @@ pub fn build(b: *std.Build) void {
 
     const options_module = options_step.createModule();
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
 
     _ = b.addModule("root", .{
         .root_source_file = b.path("src/zxaudio2.zig"),
diff --git a/samples/audio_experiments/build.zig b/samples/audio_experiments/build.zig
@@ -32,14 +32,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     });
     exe.root_module.addImport("zxaudio2", zxaudio2.module("root"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/audio_playback_test/build.zig b/samples/audio_playback_test/build.zig
@@ -21,14 +21,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
 
     @import("system_sdk").addLibraryPathsTo(exe);
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/bindless/build.zig b/samples/bindless/build.zig
@@ -33,14 +33,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zstbi", zstbi.module("root"));
     exe.linkLibrary(zstbi.artifact("zstbi"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/directml_convolution_test/build.zig b/samples/directml_convolution_test/build.zig
@@ -20,14 +20,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
 
     @import("system_sdk").addLibraryPathsTo(exe);
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/mesh_shader_test/build.zig b/samples/mesh_shader_test/build.zig
@@ -27,14 +27,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zmesh", zmesh.module("root"));
     exe.linkLibrary(zmesh.artifact("zmesh"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/minimal_d3d12/build.zig b/samples/minimal_d3d12/build.zig
@@ -20,9 +20,7 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
 
     @import("system_sdk").addLibraryPathsTo(exe);
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     exe.root_module.addImport("zwin32", zwin32.module("root"));
 
     if (builtin.os.tag == .windows or builtin.os.tag == .linux) {
diff --git a/samples/minimal_glfw_d3d12/build.zig b/samples/minimal_glfw_d3d12/build.zig
@@ -27,14 +27,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zglfw", zglfw.module("root"));
     exe.linkLibrary(zglfw.artifact("glfw"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/minimal_zgui_glfw_d3d12/build.zig b/samples/minimal_zgui_glfw_d3d12/build.zig
@@ -28,13 +28,10 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zgui", zgui.module("root"));
     exe.linkLibrary(zgui.artifact("imgui"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     exe.root_module.addImport("zwin32", zwin32.module("root"));
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/minimal_zgui_win32_d3d12/build.zig b/samples/minimal_zgui_win32_d3d12/build.zig
@@ -15,14 +15,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
 
     @import("system_sdk").addLibraryPathsTo(exe);
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/openvr_test/build.zig b/samples/openvr_test/build.zig
@@ -26,21 +26,16 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zgui", zgui.module("root"));
     exe.linkLibrary(zgui.artifact("imgui"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     exe.root_module.addImport("zwin32", zwin32.module("root"));
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
     exe.root_module.addImport("zd3d12", zd3d12.module("root"));
 
-    const zopenvr = b.dependency("zopenvr", .{
-        .target = options.target,
-    });
+    const zopenvr = b.dependency("zopenvr", .{});
     exe.root_module.addImport("zopenvr", zopenvr.module("root"));
 
     @import("zopenvr").addLibraryPathsTo(exe);
diff --git a/samples/rasterization/build.zig b/samples/rasterization/build.zig
@@ -32,14 +32,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zmesh", zmesh.module("root"));
     exe.linkLibrary(zmesh.artifact("zmesh"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/simple_openvr/build.zig b/samples/simple_openvr/build.zig
@@ -30,23 +30,18 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     exe.root_module.addImport("zglfw", zglfw.module("root"));
     exe.linkLibrary(zglfw.artifact("glfw"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
     const zd3d12_module = zd3d12.module("root");
     exe.root_module.addImport("zd3d12", zd3d12_module);
 
-    const zopenvr = b.dependency("zopenvr", .{
-        .target = options.target,
-    });
+    const zopenvr = b.dependency("zopenvr", .{});
     exe.root_module.addImport("zopenvr", zopenvr.module("root"));
 
     @import("zopenvr").addLibraryPathsTo(exe);
diff --git a/samples/simple_raytracer/build.zig b/samples/simple_raytracer/build.zig
@@ -18,14 +18,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
     });
     exe.root_module.addImport("zpix", zpix.module("root"));
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/textured_quad/build.zig b/samples/textured_quad/build.zig
@@ -21,14 +21,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
 
     @import("system_sdk").addLibraryPathsTo(exe);
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/triangle/build.zig b/samples/triangle/build.zig
@@ -21,14 +21,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
 
     @import("system_sdk").addLibraryPathsTo(exe);
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
     });
diff --git a/samples/vector_graphics_test/build.zig b/samples/vector_graphics_test/build.zig
@@ -14,14 +14,11 @@ pub fn build(b: *std.Build, options: anytype) *std.Build.Step.Compile {
 
     @import("system_sdk").addLibraryPathsTo(exe);
 
-    const zwin32 = b.dependency("zwin32", .{
-        .target = options.target,
-    });
+    const zwin32 = b.dependency("zwin32", .{});
     const zwin32_module = zwin32.module("root");
     exe.root_module.addImport("zwin32", zwin32_module);
 
     const zd3d12 = b.dependency("zd3d12", .{
-        .target = options.target,
         .debug_layer = options.zd3d12_enable_debug_layer,
         .gbv = options.zd3d12_enable_gbv,
         .d2d = true,

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ pub const xinput = @import("xinput.zig");`
`19`	`19`	`pub const dds_loader = @import("dds_loader.zig");`
`20`	`20`	`pub const d3dcompiler = @import("d3dcompiler.zig");`
`21`	`21`
`22`		`-test {`
	`22`	`+comptime {`
`23`	`23`	`std.testing.refAllDeclsRecursive(@This());`
`24`	`24`	`}`
`25`	`25`