From fb4d130d9d9dc056abe21a76b19c131e7cc13756 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Sun, 7 Dec 2025 00:44:04 +0100 Subject: [PATCH] working on build file --- .gitignore | 2 ++ build.zig | 28 +++++++++--------- .../__pycache__/log_parser.cpython-313.pyc | Bin 9643 -> 0 bytes scripts/wrap_alway_success.sh | 3 ++ 4 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 scripts/__pycache__/log_parser.cpython-313.pyc create mode 100755 scripts/wrap_alway_success.sh diff --git a/.gitignore b/.gitignore index 9b0b49b..0fd2e14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .cache/ .zig-cache/ zig-out/ +scripts/__pycache__/ *.o .gdb_history *.json @@ -9,3 +10,4 @@ zig-out/ *.qpa *.xml *.html +*.pyc diff --git a/build.zig b/build.zig index 5803345..5c1e15e 100644 --- a/build.zig +++ b/build.zig @@ -173,7 +173,7 @@ fn addCTestRunner(b: *std.Build, impl: *const ImplementationDesc, exe: *std.Buil fn addCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *const ImplementationDesc, impl_lib: *std.Build.Step.Compile, comptime gdb: bool) !*std.Build.Step { const cts = b.dependency("cts_bin", .{}); - const cts_exe_path = cts.path(b.fmt("deqp-vk-{s}", .{ + const cts_exe_name = cts.path(b.fmt("deqp-vk-{s}", .{ switch (if (target.query.os_tag) |tag| tag else builtin.target.os.tag) { .linux => "linux.x86_64", else => unreachable, @@ -187,17 +187,21 @@ fn addCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *const Implemen }), ).getPath3(b, null).toString(b.allocator); - var command_line = std.ArrayList([]const u8).empty; + const cts_exe_path = try cts_exe_name.getPath3(b, null).toString(b.allocator); + + const run = b.addSystemCommand(&[_][]const u8{"./scripts/wrap_alway_success.sh"}); + run.step.dependOn(&impl_lib.step); if (gdb) { - try command_line.append(b.allocator, "gdb"); - try command_line.append(b.allocator, "--args"); + run.addArg("gdb"); + run.addArg("--args"); } - try command_line.append(b.allocator, try cts_exe_path.getPath3(b, null).toString(b.allocator)); - try command_line.append(b.allocator, b.fmt("--deqp-archive-dir={s}", .{try cts.path("").getPath3(b, null).toString(b.allocator)})); - try command_line.append(b.allocator, b.fmt("--deqp-vk-library-path={s}", .{b.getInstallPath(.lib, impl_lib.out_lib_filename)})); - try command_line.append(b.allocator, "--deqp-log-filename=vk-cts-logs.qpa"); + run.addArg(cts_exe_path); + run.addArg(b.fmt("--deqp-archive-dir={s}", .{try cts.path("").getPath3(b, null).toString(b.allocator)})); + run.addArg(b.fmt("--deqp-vk-library-path={s}", .{b.getInstallPath(.lib, impl_lib.out_lib_filename)})); + run.addArg("--deqp-log-filename=vk-cts-logs.qpa"); + run.addArg("--deqp-log-compact=enable"); var requires_explicit_tests = false; if (b.args) |args| { @@ -205,17 +209,13 @@ fn addCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *const Implemen if (std.mem.startsWith(u8, arg, "--deqp-case")) { requires_explicit_tests = true; } - try command_line.append(b.allocator, arg); + run.addArg(arg); } } if (!requires_explicit_tests) { - try command_line.append(b.allocator, b.fmt("--deqp-caselist-file={s}", .{mustpass})); + run.addArg(b.fmt("--deqp-caselist-file={s}", .{mustpass})); } - const run = b.addSystemCommand(command_line.items); - run.expectExitCode(1); - run.step.dependOn(&impl_lib.step); - const run_to_xml = b.addSystemCommand(&[_][]const u8{ "python", "./scripts/cts_logs_to_xml.py", "./vk-cts-logs.qpa", "./vk-cts-logs.xml" }); run_to_xml.step.dependOn(&run.step); diff --git a/scripts/__pycache__/log_parser.cpython-313.pyc b/scripts/__pycache__/log_parser.cpython-313.pyc deleted file mode 100644 index dc7e885614401aa5e00275ef0ed4e5e00ef016b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9643 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 diff --git a/scripts/wrap_alway_success.sh b/scripts/wrap_alway_success.sh new file mode 100755 index 0000000..24e0c99 --- /dev/null +++ b/scripts/wrap_alway_success.sh @@ -0,0 +1,3 @@ +#!/bin/sh +"$@" +exit 0