authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-08-13 23:59:50+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-08-14 07:03:23+02:00
log3b51b43dc890dd8df17cb647ff7e1d3a53c438e7
tree26011c47529b304a95d71ea95e7e8ebe0acbf8ab
parent4a2b23c2beb043c1e5368d3737893494d61d4060
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

build/test: Add -Dtest-target-filter for filtering module tests by target triple.

This is useful during porting work where you're not interested in running all targets all the time while iterating on changes.

2 files changed, 14 insertions(+), 1 deletions(-)

build.zig+6
......@@ -379,6 +379,7 @@ pub fn build(b: *std.Build) !void {
379379 }
380380
381381 const test_filters = b.option([]const []const u8, "test-filter", "Skip tests that do not match any filter") orelse &[0][]const u8{};
382 const test_target_filters = b.option([]const []const u8, "test-target-filter", "Skip tests whose target triple do not match any filter") orelse &[0][]const u8{};
382383
383384 const test_cases_options = b.addOptions();
384385
......@@ -457,6 +458,7 @@ pub fn build(b: *std.Build) !void {
457458
458459 test_step.dependOn(tests.addModuleTests(b, .{
459460 .test_filters = test_filters,
461 .test_target_filters = test_target_filters,
460462 .root_src = "test/behavior.zig",
461463 .name = "behavior",
462464 .desc = "Run the behavior tests",
......@@ -470,6 +472,7 @@ pub fn build(b: *std.Build) !void {
470472
471473 test_step.dependOn(tests.addModuleTests(b, .{
472474 .test_filters = test_filters,
475 .test_target_filters = test_target_filters,
473476 .root_src = "test/c_import.zig",
474477 .name = "c-import",
475478 .desc = "Run the @cImport tests",
......@@ -482,6 +485,7 @@ pub fn build(b: *std.Build) !void {
482485
483486 test_step.dependOn(tests.addModuleTests(b, .{
484487 .test_filters = test_filters,
488 .test_target_filters = test_target_filters,
485489 .root_src = "lib/compiler_rt.zig",
486490 .name = "compiler-rt",
487491 .desc = "Run the compiler_rt tests",
......@@ -495,6 +499,7 @@ pub fn build(b: *std.Build) !void {
495499
496500 test_step.dependOn(tests.addModuleTests(b, .{
497501 .test_filters = test_filters,
502 .test_target_filters = test_target_filters,
498503 .root_src = "lib/c.zig",
499504 .name = "universal-libc",
500505 .desc = "Run the universal libc tests",
......@@ -521,6 +526,7 @@ pub fn build(b: *std.Build) !void {
521526 test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filters, optimization_modes));
522527 test_step.dependOn(tests.addModuleTests(b, .{
523528 .test_filters = test_filters,
529 .test_target_filters = test_target_filters,
524530 .root_src = "lib/std/std.zig",
525531 .name = "std",
526532 .desc = "Run the standard library tests",
test/tests.zig+8-1
......@@ -965,6 +965,7 @@ pub fn addRunTranslatedCTests(
965965
966966const ModuleTestOptions = struct {
967967 test_filters: []const []const u8,
968 test_target_filters: []const []const u8,
968969 root_src: []const u8,
969970 name: []const u8,
970971 desc: []const u8,
......@@ -986,6 +987,13 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
986987
987988 const resolved_target = b.resolveTargetQuery(test_target.target);
988989 const target = resolved_target.result;
990 const triple_txt = target.zigTriple(b.allocator) catch @panic("OOM");
991
992 if (options.test_target_filters.len > 0) {
993 for (options.test_target_filters) |filter| {
994 if (std.mem.indexOf(u8, triple_txt, filter) != null) break;
995 } else continue;
996 }
989997
990998 if (options.skip_libc and test_target.link_libc == true)
991999 continue;
......@@ -1034,7 +1042,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
10341042 if (!want_this_mode) continue;
10351043
10361044 const libc_suffix = if (test_target.link_libc == true) "-libc" else "";
1037 const triple_txt = target.zigTriple(b.allocator) catch @panic("OOM");
10381045 const model_txt = target.cpu.model.name;
10391046
10401047 // wasm32-wasi builds need more RAM, idk why