Skip to content

Commit cdba1d5

Browse files
committed
test-cli: port build options test to new build system API
Since we need testing for passing `--build-file` and `--cache-dir` together anyway, use it to test the disabled build options test.
1 parent fe85569 commit cdba1d5

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

test/standalone/options/build.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub fn build(b: *std.Build) void {
88
}) });
99

1010
const options = b.addOptions();
11-
main.addOptions("build_options", options);
11+
main.root_module.addOptions("build_options", options);
1212
options.addOption(bool, "bool_true", b.option(bool, "bool_true", "t").?);
1313
options.addOption(bool, "bool_false", b.option(bool, "bool_false", "f").?);
1414
options.addOption(u32, "int", b.option(u32, "int", "i").?);

test/tests.zig

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,16 +1657,23 @@ pub fn addCliTests(b: *std.Build) *Step {
16571657
}
16581658

16591659
{
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);
16701677
}
16711678

16721679
return step;

0 commit comments

Comments
 (0)