mirror of
https://codeberg.org/andyscott/ziglings.git
synced 2024-11-09 11:40:46 -05:00
test: change the order of zig build
options
In test case 1 and 2, move the -Dhealed option before the -Dn option, for consistency. Fix a typo in cmd.setName in test case 1 and 2. Remove a confusing comment in test case 1.
This commit is contained in:
parent
131772edd7
commit
5b2e842157
1 changed files with 6 additions and 7 deletions
|
@ -30,7 +30,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
|
||||||
};
|
};
|
||||||
|
|
||||||
{
|
{
|
||||||
// Test that `zig build -Dn=n -Dhealed test` selects the nth exercise.
|
// Test that `zig build -Dhealed -Dn=n test` selects the nth exercise.
|
||||||
const case_step = createCase(b, "case-1");
|
const case_step = createCase(b, "case-1");
|
||||||
|
|
||||||
var i: usize = 0;
|
var i: usize = 0;
|
||||||
|
@ -39,12 +39,11 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
|
||||||
if (ex.skip) continue;
|
if (ex.skip) continue;
|
||||||
|
|
||||||
const cmd = b.addSystemCommand(
|
const cmd = b.addSystemCommand(
|
||||||
&.{ b.zig_exe, "build", b.fmt("-Dn={}", .{i}), "-Dhealed", "test" },
|
&.{ b.zig_exe, "build", "-Dhealed", b.fmt("-Dn={}", .{i}), "test" },
|
||||||
);
|
);
|
||||||
cmd.setName(b.fmt("zig build -D={} -Dhealed test", .{i}));
|
cmd.setName(b.fmt("zig build -Dhealed -Dn={} test", .{i}));
|
||||||
cmd.expectExitCode(0);
|
cmd.expectExitCode(0);
|
||||||
|
|
||||||
// Some exercise output has an extra space character.
|
|
||||||
if (ex.check_stdout)
|
if (ex.check_stdout)
|
||||||
expectStdOutMatch(cmd, ex.output)
|
expectStdOutMatch(cmd, ex.output)
|
||||||
else
|
else
|
||||||
|
@ -57,7 +56,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
// Test that `zig build -Dn=n -Dhealed test` skips disabled esercises.
|
// Test that `zig build -Dhealed -Dn=n test` skips disabled esercises.
|
||||||
const case_step = createCase(b, "case-2");
|
const case_step = createCase(b, "case-2");
|
||||||
|
|
||||||
var i: usize = 0;
|
var i: usize = 0;
|
||||||
|
@ -66,9 +65,9 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
|
||||||
if (!ex.skip) continue;
|
if (!ex.skip) continue;
|
||||||
|
|
||||||
const cmd = b.addSystemCommand(
|
const cmd = b.addSystemCommand(
|
||||||
&.{ b.zig_exe, "build", b.fmt("-Dn={}", .{i}), "-Dhealed", "test" },
|
&.{ b.zig_exe, "build", "-Dhealed", b.fmt("-Dn={}", .{i}), "test" },
|
||||||
);
|
);
|
||||||
cmd.setName(b.fmt("zig build -D={} -Dhealed test", .{i}));
|
cmd.setName(b.fmt("zig build -Dhealed -Dn={} test", .{i}));
|
||||||
cmd.expectExitCode(0);
|
cmd.expectExitCode(0);
|
||||||
cmd.expectStdOutEqual("");
|
cmd.expectStdOutEqual("");
|
||||||
expectStdErrMatch(cmd, b.fmt("{s} skipped", .{ex.main_file}));
|
expectStdErrMatch(cmd, b.fmt("{s} skipped", .{ex.main_file}));
|
||||||
|
|
Loading…
Reference in a new issue