@@ -25,23 +25,22 @@ fn getTarget(original_target: ResolvedTarget) ResolvedTarget {
25
25
const TestTarget = struct {
26
26
query : Query ,
27
27
single_threaded : bool = false ,
28
- bundled : bool ,
29
28
};
30
29
31
30
const ci_targets = switch (builtin .target .cpu .arch ) {
32
31
.x86_64 = > switch (builtin .target .os .tag ) {
33
32
.linux = > [_ ]TestTarget {
34
- TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .musl }, . bundled = true },
35
- TestTarget { .query = .{ .cpu_arch = .x86 , .abi = .musl }, . bundled = true },
36
- TestTarget { .query = .{ .cpu_arch = .aarch64 , .abi = .musl }, . bundled = true },
33
+ TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .musl } },
34
+ TestTarget { .query = .{ .cpu_arch = .x86 , .abi = .musl } },
35
+ TestTarget { .query = .{ .cpu_arch = .aarch64 , .abi = .musl } },
37
36
},
38
37
.windows = > [_ ]TestTarget {
39
- TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .gnu }, . bundled = true },
38
+ TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .gnu } },
40
39
// Disabled due to https://github.com/ziglang/zig/issues/20047
41
- // TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu }, .bundled = true },
40
+ // TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu } },
42
41
},
43
42
.macos = > [_ ]TestTarget {
44
- TestTarget { .query = .{ .cpu_arch = .x86_64 }, . bundled = true },
43
+ TestTarget { .query = .{ .cpu_arch = .x86_64 } },
45
44
},
46
45
else = > [_ ]TestTarget {},
47
46
},
@@ -51,44 +50,44 @@ const ci_targets = switch (builtin.target.cpu.arch) {
51
50
const all_test_targets = switch (builtin .target .cpu .arch ) {
52
51
.x86_64 = > switch (builtin .target .os .tag ) {
53
52
.linux = > [_ ]TestTarget {
54
- TestTarget { .query = .{}, . bundled = false },
55
- TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .musl }, . bundled = true },
56
- TestTarget { .query = .{ .cpu_arch = .x86 , .abi = .musl }, . bundled = true },
57
- TestTarget { .query = .{ .cpu_arch = .aarch64 , .abi = .musl }, . bundled = true },
58
- TestTarget { .query = .{ .cpu_arch = .riscv64 , .abi = .musl }, . bundled = true },
59
- TestTarget { .query = .{ .cpu_arch = .mips , .abi = .musl }, . bundled = true },
60
- TestTarget { .query = .{ .cpu_arch = .x86_64 , .os_tag = .windows }, . bundled = true },
53
+ TestTarget { .query = .{} },
54
+ TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .musl } },
55
+ TestTarget { .query = .{ .cpu_arch = .x86 , .abi = .musl } },
56
+ TestTarget { .query = .{ .cpu_arch = .aarch64 , .abi = .musl } },
57
+ TestTarget { .query = .{ .cpu_arch = .riscv64 , .abi = .musl } },
58
+ TestTarget { .query = .{ .cpu_arch = .mips , .abi = .musl } },
59
+ TestTarget { .query = .{ .cpu_arch = .x86_64 , .os_tag = .windows } },
61
60
// Disabled due to https://github.com/ziglang/zig/issues/20047
62
- // TestTarget{ .query = .{ .cpu_arch = .x86, .os_tag = .windows }, .bundled = true },
63
- TestTarget { .query = .{ .cpu_arch = .x86_64 , .os_tag = .macos }, . bundled = true },
64
- TestTarget { .query = .{ .cpu_arch = .aarch64 , .os_tag = .macos }, . bundled = true },
61
+ // TestTarget{ .query = .{ .cpu_arch = .x86, .os_tag = .windows } },
62
+ TestTarget { .query = .{ .cpu_arch = .x86_64 , .os_tag = .macos } },
63
+ TestTarget { .query = .{ .cpu_arch = .aarch64 , .os_tag = .macos } },
65
64
},
66
65
.windows = > [_ ]TestTarget {
67
- TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .gnu }, . bundled = true },
66
+ TestTarget { .query = .{ .cpu_arch = .x86_64 , .abi = .gnu } },
68
67
// Disabled due to https://github.com/ziglang/zig/issues/20047
69
- // TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu }, .bundled = true },
68
+ // TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu } },
70
69
},
71
70
.freebsd = > [_ ]TestTarget {
72
- TestTarget { .query = .{}, . bundled = false },
73
- TestTarget { .query = .{ .cpu_arch = .x86_64 }, . bundled = true },
71
+ TestTarget { .query = .{} },
72
+ TestTarget { .query = .{ .cpu_arch = .x86_64 } },
74
73
},
75
74
.macos = > [_ ]TestTarget {
76
- TestTarget { .query = .{ .cpu_arch = .x86_64 }, . bundled = true },
75
+ TestTarget { .query = .{ .cpu_arch = .x86_64 } },
77
76
},
78
77
else = > [_ ]TestTarget {
79
- TestTarget { .query = .{}, . bundled = false },
78
+ TestTarget { .query = .{} },
80
79
},
81
80
},
82
81
.aarch64 = > switch (builtin .target .os .tag ) {
83
82
.linux , .windows , .freebsd , .macos = > [_ ]TestTarget {
84
- TestTarget { .query = .{}, . bundled = true },
83
+ TestTarget { .query = .{} },
85
84
},
86
85
else = > [_ ]TestTarget {
87
- TestTarget { .query = .{}, . bundled = false },
86
+ TestTarget { .query = .{} },
88
87
},
89
88
},
90
89
else = > [_ ]TestTarget {
91
- TestTarget { .query = .{}, . bundled = false },
90
+ TestTarget { .query = .{} },
92
91
},
93
92
};
94
93
@@ -178,7 +177,6 @@ pub fn build(b: *std.Build) !void {
178
177
179
178
const test_targets = computeTestTargets (query .isNative (), ci ) orelse &[_ ]TestTarget {.{
180
179
.query = query ,
181
- .bundled = true ,
182
180
}};
183
181
const test_step = b .step ("test" , "Run library tests" );
184
182
0 commit comments