Commit 38c1536b96888b17626b35acf911cef56668b54f | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2026-10-09 12:50:27+02:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-10-10 08:36:08+02:00
log	38c1536b96888b17626b35acf911cef56668b54f
tree	0e687f443c234bd13807a4ccb6e01cf173094f28
parent	93316d6e613cbcf0b1f94da42bffdf9eac3223de
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

test-standalone: respect -Dskip-non-native in cross-compiling tests

closes https://github.com/ziglang/zig/issues/25471

13 files changed, 92 insertions(+), 24 deletions(-)

build.zig
test
- standalone
  - build.zig
  - coff_dwarf
    build.zig
  - compile_asm
    build.zig
  - elf2
    build.zig
  - embed_generated_file
    build.zig
  - entry_point
    build.zig
  - glibc_compat
    build.zig
  - install_raw_hex
    build.zig
  - tsan
    build.zig
  - windows_entry_points
    build.zig
  - windows_resources
    build.zig
- tests.zig

build.zig+1

...	...	@@ -636,6 +636,7 @@ pub fn build(b: *std.Build) !void {
636	636	test_step.dependOn(tests.addStandaloneTests(
637	637	b,
638	638	optimize_modes,
	639	skip_non_native,
639	640	enable_macos_sdk,
640	641	enable_ios_sdk,
641	642	enable_symlinks_windows,

test/standalone/build.zig+8-3

...	...	@@ -14,6 +14,7 @@ pub fn build(b: *std.Build) void {
14	14	const simple_skip_release_safe = b.option(bool, "simple_skip_release_safe", "Simple tests skip release-safe builds") orelse false;
15	15	const simple_skip_release_fast = b.option(bool, "simple_skip_release_fast", "Simple tests skip release-fast builds") orelse false;
16	16	const simple_skip_release_small = b.option(bool, "simple_skip_release_small", "Simple tests skip release-small builds") orelse false;
	17	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
17	18
18	19	const simple_dep = b.dependency("simple", .{
19	20	.skip_debug = simple_skip_debug,
...	...	@@ -103,7 +104,7 @@ pub fn build(b: *std.Build) void {
103	104	if (std.mem.eql(u8, dep_name, "simple")) continue;
104	105
105	106	const all_pkgs = @import("root").dependencies.packages;
106		inline for (@typeInfo(all_pkgs).@"struct".decl_names) \|pkg_hash\| {
	107	const forward_skip_non_native = inline for (@typeInfo(all_pkgs).@"struct".decl_names) \|pkg_hash\| {
107	108	if (std.mem.eql(u8, dep_hash, pkg_hash)) {
108	109	const pkg = @field(all_pkgs, pkg_hash);
109	110	if (!@hasDecl(pkg, "build_zig")) {
...	...	@@ -121,11 +122,15 @@ pub fn build(b: *std.Build) void {
121	122	{
122	123	continue :add_dep_steps;
123	124	}
124		break;
	125	break @hasDecl(pkg.build_zig, "supports_skip_non_native") and
	126	pkg.build_zig.supports_skip_non_native;
125	127	}
126	128	} else unreachable;
127	129
128		const dep = b.dependency(dep_name, .{});
	130	const dep = if (forward_skip_non_native)
	131	b.dependency(dep_name, .{ .skip_non_native = skip_non_native })
	132	else
	133	b.dependency(dep_name, .{});
129	134	const dep_step = dep.builder.default_step;
130	135	dep_step.name = b.fmt("standalone_test_cases.{s}", .{dep_name});
131	136	step.dependOn(dep_step);

test/standalone/coff_dwarf/build.zig+6-11

...	...	@@ -1,19 +1,12 @@
1	1	const std = @import("std");
2	2
	3	pub const supports_skip_non_native = true;
	4
3	5	/// This tests the path where DWARF information is embedded in a COFF binary
4	6	pub fn build(b: *std.Build) void {
5		const host = b.graph.host;
6
7		// https://github.com/ziglang/zig/issues/25471
8		if (host.result.os.tag == .freebsd) return;
	7	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
9	8
10		switch (host.result.cpu.arch) {
11		.aarch64,
12		.x86,
13		.x86_64,
14		=> {},
15		else => return,
16		}
	9	const host = b.graph.host;
17	10
18	11	const test_step = b.step("test", "Test it");
19	12	b.default_step = test_step;
...	...	@@ -24,6 +17,8 @@ pub fn build(b: *std.Build) void {
24	17	else => b.resolveTargetQuery(.{ .os_tag = .windows }),
25	18	};
26	19
	20	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &host.result)) return;
	21
27	22	const exe = b.addExecutable(.{
28	23	.name = "main",
29	24	.root_module = b.createModule(.{

test/standalone/compile_asm/build.zig+6

...	...	@@ -1,6 +1,10 @@
1	1	const std = @import("std");
2	2
	3	pub const supports_skip_non_native = true;
	4
3	5	pub fn build(b: *std.Build) !void {
	6	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	7
4	8	const test_step = b.step("test", "Test it");
5	9	b.default_step = test_step;
6	10
...	...	@@ -13,6 +17,8 @@ pub fn build(b: *std.Build) !void {
13	17	},
14	18	});
15	19
	20	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) return;
	21
16	22	const kernel = b.addExecutable(.{
17	23	.name = "kernel",
18	24	.root_module = b.createModule(.{

test/standalone/elf2/build.zig+7

...	...	@@ -1,4 +1,8 @@
	1	pub const supports_skip_non_native = true;
	2
1	3	pub fn build(b: *Build) void {
	4	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	5
2	6	const test_step = b.step("test", "Test the new ELF linker");
3	7	b.default_step = test_step;
4	8
...	...	@@ -15,6 +19,9 @@ pub fn build(b: *Build) void {
15	19	.cpu_arch = .x86_64,
16	20	.os_tag = .linux,
17	21	});
	22
	23	if (skip_non_native and !std.zig.target.isNative(&x86_64_linux_target.query, &x86_64_linux_target.result, &b.graph.host.result)) return;
	24
18	25	addOne(b, test_step, x86_64_linux_target, false, .static, false, false, "elf2-hello-selfhosted-static");
19	26	addOne(b, test_step, x86_64_linux_target, false, .static, true, false, "elf2-hello-selfhosted-static-pie");
20	27	addOne(b, test_step, x86_64_linux_target, true, .static, false, false, "elf2-hello-llvm-static");

test/standalone/embed_generated_file/build.zig+12-4

...	...	@@ -1,6 +1,17 @@
1	1	const std = @import("std");
2	2
	3	pub const supports_skip_non_native = true;
	4
3	5	pub fn build(b: *std.Build) void {
	6	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	7
	8	const target = b.resolveTargetQuery(.{
	9	.cpu_arch = .x86,
	10	.os_tag = .freestanding,
	11	});
	12
	13	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) return;
	14
4	15	const test_step = b.step("test", "Test it");
5	16	b.default_step = test_step;
6	17
...	...	@@ -8,10 +19,7 @@ pub fn build(b: *std.Build) void {
8	19	.name = "bootloader",
9	20	.root_module = b.createModule(.{
10	21	.root_source_file = b.path("bootloader.zig"),
11		.target = b.resolveTargetQuery(.{
12		.cpu_arch = .x86,
13		.os_tag = .freestanding,
14		}),
	22	.target = target,
15	23	.optimize = .small,
16	24	}),
17	25	});

test/standalone/entry_point/build.zig+11-3

...	...	@@ -1,11 +1,19 @@
	1	pub const supports_skip_non_native = true;
	2
1	3	pub fn build(b: *std.Build) !void {
	4	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	5
	6	const target = b.resolveTargetQuery(try .parse(.{
	7	.arch_os_abi = "x86_64-linux",
	8	}));
	9
	10	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) return;
	11
2	12	const mod = b.createModule(.{
3	13	// Setting the entry point doesn't work properly on all targets right now. Since we're
4	14	// really just trying to make sure that the compiler frontend respects `-fentry` and
5	15	// includes it in the cache manifest, just test for a target where it works.
6		.target = b.resolveTargetQuery(try .parse(.{
7		.arch_os_abi = "x86_64-linux",
8		})),
	16	.target = target,
9	17	.optimize = .fast, // non-Debug build for reproducible output
10	18	.root_source_file = b.path("main.zig"),
11	19	});

test/standalone/glibc_compat/build.zig+15-3

...	...	@@ -1,6 +1,8 @@
1	1	const std = @import("std");
2	2	const builtin = @import("builtin");
3	3
	4	pub const supports_skip_non_native = true;
	5
4	6	// To run executables linked against a specific glibc version, the
5	7	// run-time glibc version needs to be new enough. Check the host's glibc
6	8	// version. Note that this does not allow for translation/vm/emulation
...	...	@@ -8,17 +10,23 @@ const builtin = @import("builtin");
8	10	const running_glibc_ver = builtin.os.versionRange().gnuLibCVersion();
9	11
10	12	pub fn build(b: *std.Build) void {
	13	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	14
11	15	const test_step = b.step("test", "Test");
12	16	b.default_step = test_step;
13	17
14	18	for ([_][]const u8{ "aarch64-linux-gnu.2.27", "aarch64-linux-gnu.2.34" }) \|t\| {
	19	const target = b.resolveTargetQuery(std.Target.Query.parse(
	20	.{ .arch_os_abi = t },
	21	) catch unreachable);
	22
	23	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) continue;
	24
15	25	const exe = b.addExecutable(.{
16	26	.name = t,
17	27	.root_module = b.createModule(.{
18	28	.root_source_file = null,
19		.target = b.resolveTargetQuery(std.Target.Query.parse(
20		.{ .arch_os_abi = t },
21		) catch unreachable),
	29	.target = target,
22	30	.link_libc = true,
23	31	}),
24	32	});
...	...	@@ -49,6 +57,8 @@ pub fn build(b: *std.Build) void {
49	57	.{ .arch_os_abi = t },
50	58	) catch unreachable);
51	59
	60	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) continue;
	61
52	62	const glibc_ver = target.result.os.version_range.linux.glibc;
53	63
54	64	// only build test if glibc version supports the architecture
...	...	@@ -103,6 +113,8 @@ pub fn build(b: *std.Build) void {
103	113	.{ .arch_os_abi = t },
104	114	) catch unreachable);
105	115
	116	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) continue;
	117
106	118	if (target.result.cpu.arch.isLoongArch()) continue; // https://github.com/Vexu/arocc/issues/1096
107	119
108	120	const glibc_ver = target.result.os.version_range.linux.glibc;

test/standalone/install_raw_hex/build.zig+6

...	...	@@ -1,7 +1,11 @@
1	1	const builtin = @import("builtin");
2	2	const std = @import("std");
3	3
	4	pub const supports_skip_non_native = true;
	5
4	6	pub fn build(b: *std.Build) void {
	7	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	8
5	9	const test_step = b.step("test", "Test it");
6	10	b.default_step = test_step;
7	11
...	...	@@ -12,6 +16,8 @@ pub fn build(b: *std.Build) void {
12	16	.abi = .gnueabihf,
13	17	});
14	18
	19	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) return;
	20
15	21	const optimize: std.builtin.Optimize = .debug;
16	22
17	23	const elf = b.addExecutable(.{

test/standalone/tsan/build.zig+6

...	...	@@ -1,5 +1,7 @@
1	1	const std = @import("std");
2	2
	3	pub const supports_skip_non_native = true;
	4
3	5	const targets: []const std.Target.Query = &.{
4	6	.{ .cpu_arch = .aarch64, .os_tag = .freebsd, .abi = .none },
5	7	.{ .cpu_arch = .x86_64, .os_tag = .freebsd, .abi = .none },
...	...	@@ -32,6 +34,8 @@ const targets: []const std.Target.Query = &.{
32	34	};
33	35
34	36	pub fn build(b: *std.Build) !void {
	37	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	38
35	39	const test_step = b.step("test", "Test the program");
36	40	b.default_step = test_step;
37	41
...	...	@@ -40,6 +44,8 @@ pub fn build(b: *std.Build) !void {
40	44	for (targets) \|query\| {
41	45	const target = b.resolveTargetQuery(query);
42	46
	47	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) continue;
	48
43	49	switch (target.result.os.tag) {
44	50	.macos => {
45	51	// compiling tsan on macos requires system headers that aren't present during cross-compilation

test/standalone/windows_entry_points/build.zig+6

...	...	@@ -1,6 +1,10 @@
1	1	const std = @import("std");
2	2
	3	pub const supports_skip_non_native = true;
	4
3	5	pub fn build(b: *std.Build) void {
	6	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	7
4	8	const test_step = b.step("test", "Test it");
5	9	b.default_step = test_step;
6	10
...	...	@@ -10,6 +14,8 @@ pub fn build(b: *std.Build) void {
10	14	.abi = .gnu,
11	15	});
12	16
	17	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) return;
	18
13	19	{
14	20	const exe = b.addExecutable(.{
15	21	.name = "main",

test/standalone/windows_resources/build.zig+6

...	...	@@ -1,6 +1,10 @@
1	1	const std = @import("std");
2	2
	3	pub const supports_skip_non_native = true;
	4
3	5	pub fn build(b: *std.Build) void {
	6	const skip_non_native = b.option(bool, "skip_non_native", "Skip non-native targets") orelse false;
	7
4	8	const test_step = b.step("test", "Test it");
5	9	b.default_step = test_step;
6	10
...	...	@@ -10,6 +14,8 @@ pub fn build(b: *std.Build) void {
10	14	.abi = .gnu,
11	15	});
12	16
	17	if (skip_non_native and !std.zig.target.isNative(&target.query, &target.result, &b.graph.host.result)) return;
	18
13	19	const generated_h_step = b.addWriteFile("generated.h", "#define GENERATED_DEFINE \"foo\"");
14	20
15	21	add(b, b.graph.host, .any, test_step, generated_h_step);

test/tests.zig+2

...	...	@@ -2374,6 +2374,7 @@ pub fn addErrorTraceTests(b: std.Build, options: ErrorTracesContext.Options) S
2374	2374	pub fn addStandaloneTests(
2375	2375	b: *std.Build,
2376	2376	optimize_modes: []const OptimizeMode,
	2377	skip_non_native: bool,
2377	2378	enable_macos_sdk: bool,
2378	2379	enable_ios_sdk: bool,
2379	2380	enable_symlinks_windows: bool,
...	...	@@ -2388,6 +2389,7 @@ pub fn addStandaloneTests(
2388	2389	.simple_skip_release_safe = mem.findScalar(OptimizeMode, optimize_modes, .safe) == null,
2389	2390	.simple_skip_release_fast = mem.findScalar(OptimizeMode, optimize_modes, .fast) == null,
2390	2391	.simple_skip_release_small = mem.findScalar(OptimizeMode, optimize_modes, .small) == null,
	2392	.skip_non_native = skip_non_native,
2391	2393	});
2392	2394	const test_cases_dep_step = test_cases_dep.builder.default_step;
2393	2395	test_cases_dep_step.name = test_cases_dep_name;