authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2024-04-15 01:28:48-07:00
committergravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2024-04-15 02:09:48-07:00
logcffe1999c695c60d2c61c0781a1e16edaa2263f3
treecf5e6fcf3705fc482f60df1545844fb006075135
parentf4c4c04f1c6f48b4d414a6ef88ff76c26f2d4f8a

windows_argv standalone test: Only test against MSVC if it's available

1 files changed, 41 insertions(+), 29 deletions(-)

test/standalone/windows_argv/build.zig+41-29
...@@ -9,28 +9,6 @@ pub fn build(b: *std.Build) !void {...@@ -9,28 +9,6 @@ pub fn build(b: *std.Build) !void {
99
10 const optimize: std.builtin.OptimizeMode = .Debug;10 const optimize: std.builtin.OptimizeMode = .Debug;
1111
12 const lib_msvc = b.addStaticLibrary(.{
13 .name = "toargv-msvc",
14 .root_source_file = .{ .path = "lib.zig" },
15 .target = b.resolveTargetQuery(.{
16 .abi = .msvc,
17 }),
18 .optimize = optimize,
19 });
20 const verify_msvc = b.addExecutable(.{
21 .name = "verify-msvc",
22 .target = b.resolveTargetQuery(.{
23 .abi = .msvc,
24 }),
25 .optimize = optimize,
26 });
27 verify_msvc.addCSourceFile(.{
28 .file = .{ .path = "verify.c" },
29 .flags = &.{ "-DUNICODE", "-D_UNICODE" },
30 });
31 verify_msvc.linkLibrary(lib_msvc);
32 verify_msvc.linkLibC();
33
34 const lib_gnu = b.addStaticLibrary(.{12 const lib_gnu = b.addStaticLibrary(.{
35 .name = "toargv-gnu",13 .name = "toargv-gnu",
36 .root_source_file = .{ .path = "lib.zig" },14 .root_source_file = .{ .path = "lib.zig" },
...@@ -71,18 +49,52 @@ pub fn build(b: *std.Build) !void {...@@ -71,18 +49,52 @@ pub fn build(b: *std.Build) !void {
71 };49 };
72 const fuzz_seed_arg = std.fmt.allocPrint(b.allocator, "{}", .{fuzz_seed}) catch @panic("oom");50 const fuzz_seed_arg = std.fmt.allocPrint(b.allocator, "{}", .{fuzz_seed}) catch @panic("oom");
7351
74 const run_msvc = b.addRunArtifact(fuzz);
75 run_msvc.setName("fuzz-msvc");
76 run_msvc.addArtifactArg(verify_msvc);
77 run_msvc.addArgs(&.{ fuzz_iterations_arg, fuzz_seed_arg });
78 run_msvc.expectExitCode(0);
79
80 const run_gnu = b.addRunArtifact(fuzz);52 const run_gnu = b.addRunArtifact(fuzz);
81 run_gnu.setName("fuzz-gnu");53 run_gnu.setName("fuzz-gnu");
82 run_gnu.addArtifactArg(verify_gnu);54 run_gnu.addArtifactArg(verify_gnu);
83 run_gnu.addArgs(&.{ fuzz_iterations_arg, fuzz_seed_arg });55 run_gnu.addArgs(&.{ fuzz_iterations_arg, fuzz_seed_arg });
84 run_gnu.expectExitCode(0);56 run_gnu.expectExitCode(0);
8557
86 test_step.dependOn(&run_msvc.step);
87 test_step.dependOn(&run_gnu.step);58 test_step.dependOn(&run_gnu.step);
59
60 // Only target the MSVC ABI if MSVC/Windows SDK is available
61 const has_msvc = has_msvc: {
62 const sdk = std.zig.WindowsSdk.find(b.allocator) catch |err| switch (err) {
63 error.OutOfMemory => @panic("oom"),
64 else => break :has_msvc false,
65 };
66 defer sdk.free(b.allocator);
67 break :has_msvc true;
68 };
69 if (has_msvc) {
70 const lib_msvc = b.addStaticLibrary(.{
71 .name = "toargv-msvc",
72 .root_source_file = .{ .path = "lib.zig" },
73 .target = b.resolveTargetQuery(.{
74 .abi = .msvc,
75 }),
76 .optimize = optimize,
77 });
78 const verify_msvc = b.addExecutable(.{
79 .name = "verify-msvc",
80 .target = b.resolveTargetQuery(.{
81 .abi = .msvc,
82 }),
83 .optimize = optimize,
84 });
85 verify_msvc.addCSourceFile(.{
86 .file = .{ .path = "verify.c" },
87 .flags = &.{ "-DUNICODE", "-D_UNICODE" },
88 });
89 verify_msvc.linkLibrary(lib_msvc);
90 verify_msvc.linkLibC();
91
92 const run_msvc = b.addRunArtifact(fuzz);
93 run_msvc.setName("fuzz-msvc");
94 run_msvc.addArtifactArg(verify_msvc);
95 run_msvc.addArgs(&.{ fuzz_iterations_arg, fuzz_seed_arg });
96 run_msvc.expectExitCode(0);
97
98 test_step.dependOn(&run_msvc.step);
99 }
88}100}