Commit cdba1d591aae2f5ac5dcd5ae186f5696f218710c | zig

author	Jacob Young <jacobly@ziglang.org> 2025-05-20 22:59:07-04:00
committer	Jacob Young <jacobly@ziglang.org> 2025-05-20 23:02:51-04:00
log	cdba1d591aae2f5ac5dcd5ae186f5696f218710c
tree	2eb316d86c9a3b0dccc58e69de6beefee445ab6e
parent	fe855691f6f742a14678cb617422977c2a55be39

Since we need testing for passing `--build-file` and `--cache-dir`
together anyway, use it to test the disabled build options test.

2 files changed, 18 insertions(+), 11 deletions(-)

test/standalone/options/build.zig+1-1

...	...	@@ -8,7 +8,7 @@ pub fn build(b: *std.Build) void {
8	8	}) });
9	9
10	10	const options = b.addOptions();
11		main.addOptions("build_options", options);
	11	main.root_module.addOptions("build_options", options);
12	12	options.addOption(bool, "bool_true", b.option(bool, "bool_true", "t").?);
13	13	options.addOption(bool, "bool_false", b.option(bool, "bool_false", "f").?);
14	14	options.addOption(u32, "int", b.option(u32, "int", "i").?);

test/tests.zig+17-10

...	...	@@ -1657,16 +1657,23 @@ pub fn addCliTests(b: std.Build) Step {
1657	1657	}
1658	1658
1659	1659	{
1660		// TODO this should move to become a CLI test rather than standalone
1661		// cases.addBuildFile("test/standalone/options/build.zig", .{
1662		// .extra_argv = &.{
1663		// "-Dbool_true",
1664		// "-Dbool_false=false",
1665		// "-Dint=1234",
1666		// "-De=two",
1667		// "-Dstring=hello",
1668		// },
1669		// });
	1660	const run_test = b.addSystemCommand(&.{
	1661	b.graph.zig_exe,
	1662	"build",
	1663	"test",
	1664	"-Dbool_true",
	1665	"-Dbool_false=false",
	1666	"-Dint=1234",
	1667	"-De=two",
	1668	"-Dstring=hello",
	1669	});
	1670	run_test.addArg("--build-file");
	1671	run_test.addFileArg(b.path("test/standalone/options/build.zig"));
	1672	run_test.addArg("--cache-dir");
	1673	run_test.addFileArg(.{ .cwd_relative = b.cache_root.join(b.allocator, &.{}) catch @panic("OOM") });
	1674	run_test.setName("test build options");
	1675
	1676	step.dependOn(&run_test.step);
1670	1677	}
1671	1678
1672	1679	return step;