镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content

Commit 34f5c8c

Browse files
committed
fix(test262): reject invalid runner modes (#620)
Preserve the intentional no-argument full-corpus entry point while parsing every named mode through one exact command contract. Add side-effect-free help, reject unknown, incomplete, malformed, and trailing arguments before corpus discovery, and run the pure CLI tests from both test262 build entry points. Validation: 4/4 CLI contract tests; production test262-bin build passed; help exited 0 with 0 spawned Test262 processes; unknown, missing, and malformed invocations each exited 1 with 0 spawned processes; dependency audit 15 classified edges, 0 migration targets, 60 classified tools. Test262 semantic flips pending an uncontended valid-path smoke.
1 parent fd9e8a4 commit 34f5c8c

3 files changed

Lines changed: 148 additions & 41 deletions

File tree

‎build.zig‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1835,10 +1835,24 @@ pub fn build(b: *std.Build) void {
18351835
const test262_step = b.step("test262", "Run the real test262 corpus and report pass rate");
18361836
test262_step.dependOn(&run_test262.step);
18371837

1838+
const test262_cli_tests = b.addTest(.{
1839+
.root_module = b.createModule(.{
1840+
.root_source_file = b.path("conformance/test262_cli.zig"),
1841+
.target = target,
1842+
.optimize = optimize,
1843+
}),
1844+
});
1845+
const run_test262_cli_tests = b.addRunArtifact(test262_cli_tests);
1846+
const test262_cli_test_step = b.step("test262-cli-test", "Validate fail-closed test262 command-line dispatch");
1847+
test262_cli_test_step.dependOn(&run_test262_cli_tests.step);
1848+
test262_step.dependOn(&run_test262_cli_tests.step);
1849+
18381850
// Compile-only: build the test262 runner exe without running the corpus, so
18391851
// the `--worker`/`--diag` binary can be rebuilt fast during development.
1852+
// Its small argument-contract test runs first but never opens the corpus.
18401853
const test262_install = b.addInstallArtifact(test262, .{});
1841-
const test262_bin_step = b.step("test262-bin", "Build the test262 runner exe only (no run)");
1854+
const test262_bin_step = b.step("test262-bin", "Build the test262 runner and validate its CLI (no corpus run)");
1855+
test262_bin_step.dependOn(&run_test262_cli_tests.step);
18421856
test262_bin_step.dependOn(&test262_install.step);
18431857

18441858
const displaynames_jsc_diff_cmd = b.addSystemCommand(&.{ "/usr/bin/env", home_tool, "run", "tools/intl-displaynames-jsc-diff.ts" });

‎conformance/test262.zig‎

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
const std = @import("std");
4343
const js = @import("js");
4444
const build_options = @import("build_options");
45+
const cli = @import("test262_cli.zig");
4546

4647
const worker_timeout: std.Io.Timeout = .{ .duration = .{
4748
.raw = .fromSeconds(30),
@@ -1152,46 +1153,22 @@ pub fn main(init: std.process.Init) !void {
11521153
const gpa = init.gpa;
11531154
const io = init.io;
11541155
const root = build_options.root;
1155-
1156-
var args = std.process.Args.Iterator.init(init.minimal.args);
1157-
_ = args.next(); // argv[0]
1158-
if (args.next()) |mode| {
1159-
if (std.mem.eql(u8, mode, "--worker")) {
1160-
const sub = args.next() orelse return;
1161-
const start = std.fmt.parseInt(usize, args.next() orelse "0", 10) catch 0;
1162-
const limit = std.fmt.parseInt(usize, args.next() orelse "0", 10) catch 0;
1163-
return runWorker(gpa, io, root, sub, start, limit);
1164-
}
1165-
if (std.mem.eql(u8, mode, "--drive-subtree")) {
1166-
const sub = args.next() orelse return;
1167-
return runSubtreeDriver(gpa, io, root, sub);
1168-
}
1169-
if (std.mem.eql(u8, mode, "--diag")) {
1170-
const sub = args.next() orelse return;
1171-
const filter = args.next();
1172-
return runDiag(gpa, io, root, sub, filter);
1173-
}
1174-
if (std.mem.eql(u8, mode, "--eval")) {
1175-
const path = args.next() orelse return;
1176-
return runEval(gpa, io, path);
1177-
}
1178-
if (std.mem.eql(u8, mode, "--vm-witness")) {
1179-
var count: usize = 0;
1180-
while (args.next()) |path| {
1181-
try runVmWitness(gpa, io, root, path);
1182-
count += 1;
1183-
}
1184-
if (count == 0) return error.Test262Failures;
1185-
return;
1186-
}
1187-
if (std.mem.eql(u8, mode, "--list-skips")) {
1188-
return runListSkips(gpa, io, root);
1189-
}
1190-
if (std.mem.eql(u8, mode, "--list-excluded")) {
1191-
return runListExcluded(gpa, io, root);
1192-
}
1193-
}
1194-
return runParent(gpa, io, root);
1156+
const argv = try init.minimal.args.toSlice(init.arena.allocator());
1157+
const command = cli.parse(argv[1..]) catch |err| {
1158+
std.debug.print("test262: invalid arguments; use --help for usage.\n", .{});
1159+
return err;
1160+
};
1161+
return switch (command) {
1162+
.parent => runParent(gpa, io, root),
1163+
.help => std.Io.File.stdout().writeStreamingAll(io, cli.usage),
1164+
.worker => |worker| runWorker(gpa, io, root, worker.subtree, worker.start, worker.limit),
1165+
.drive_subtree => |subtree| runSubtreeDriver(gpa, io, root, subtree),
1166+
.diag => |diagnostic| runDiag(gpa, io, root, diagnostic.subtree, diagnostic.filter),
1167+
.eval => |path| runEval(gpa, io, path),
1168+
.vm_witness => |paths| for (paths) |path| try runVmWitness(gpa, io, root, path),
1169+
.list_skips => runListSkips(gpa, io, root),
1170+
.list_excluded => runListExcluded(gpa, io, root),
1171+
};
11951172
}
11961173

11971174
fn emitStats(out: std.Io.File, io: std.Io, stats: Stats) void {

‎conformance/test262_cli.zig‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
const std = @import("std");
2+
3+
pub const usage =
4+
\\usage: test262 [mode]
5+
\\
6+
\\With no mode, run the complete configured corpus.
7+
\\
8+
\\ --help
9+
\\ --diag <subtree> [path-substring]
10+
\\ --eval <file>
11+
\\ --vm-witness <test.js> [test.js ...]
12+
\\ --list-skips
13+
\\ --list-excluded
14+
\\ --drive-subtree <subtree> (internal)
15+
\\ --worker <subtree> <start-index> <limit> (internal)
16+
\\
17+
;
18+
19+
pub const Command = union(enum) {
20+
parent,
21+
help,
22+
worker: struct { subtree: []const u8, start: usize, limit: usize },
23+
drive_subtree: []const u8,
24+
diag: struct { subtree: []const u8, filter: ?[]const u8 },
25+
eval: []const u8,
26+
vm_witness: []const []const u8,
27+
list_skips,
28+
list_excluded,
29+
};
30+
31+
pub fn parse(args: []const []const u8) error{InvalidArguments}!Command {
32+
if (args.len == 0) return .parent;
33+
const mode = args[0];
34+
if (std.mem.eql(u8, mode, "--help"))
35+
return if (args.len == 1) .help else error.InvalidArguments;
36+
if (std.mem.eql(u8, mode, "--worker")) {
37+
if (args.len != 4) return error.InvalidArguments;
38+
return .{ .worker = .{
39+
.subtree = args[1],
40+
.start = std.fmt.parseUnsigned(usize, args[2], 10) catch return error.InvalidArguments,
41+
.limit = std.fmt.parseUnsigned(usize, args[3], 10) catch return error.InvalidArguments,
42+
} };
43+
}
44+
if (std.mem.eql(u8, mode, "--drive-subtree"))
45+
return if (args.len == 2) .{ .drive_subtree = args[1] } else error.InvalidArguments;
46+
if (std.mem.eql(u8, mode, "--diag")) {
47+
if (args.len != 2 and args.len != 3) return error.InvalidArguments;
48+
return .{ .diag = .{ .subtree = args[1], .filter = if (args.len == 3) args[2] else null } };
49+
}
50+
if (std.mem.eql(u8, mode, "--eval"))
51+
return if (args.len == 2) .{ .eval = args[1] } else error.InvalidArguments;
52+
if (std.mem.eql(u8, mode, "--vm-witness"))
53+
return if (args.len >= 2) .{ .vm_witness = args[1..] } else error.InvalidArguments;
54+
if (std.mem.eql(u8, mode, "--list-skips"))
55+
return if (args.len == 1) .list_skips else error.InvalidArguments;
56+
if (std.mem.eql(u8, mode, "--list-excluded"))
57+
return if (args.len == 1) .list_excluded else error.InvalidArguments;
58+
return error.InvalidArguments;
59+
}
60+
61+
fn expectTag(expected: std.meta.Tag(Command), args: []const []const u8) !void {
62+
try std.testing.expectEqual(expected, std.meta.activeTag(try parse(args)));
63+
}
64+
65+
test "test262 CLI preserves the intentional no-argument full run" {
66+
try expectTag(.parent, &.{});
67+
}
68+
69+
test "test262 CLI recognizes every exact mode contract" {
70+
try expectTag(.help, &.{"--help"});
71+
const worker = (try parse(&.{ "--worker", "test/language", "17", "4" })).worker;
72+
try std.testing.expectEqualStrings("test/language", worker.subtree);
73+
try std.testing.expectEqual(@as(usize, 17), worker.start);
74+
try std.testing.expectEqual(@as(usize, 4), worker.limit);
75+
try expectTag(.drive_subtree, &.{ "--drive-subtree", "test/language" });
76+
const diagnostic = (try parse(&.{ "--diag", "test/language", "class" })).diag;
77+
try std.testing.expectEqualStrings("class", diagnostic.filter.?);
78+
try std.testing.expect((try parse(&.{ "--diag", "test/language" })).diag.filter == null);
79+
try expectTag(.eval, &.{ "--eval", "probe.js" });
80+
const witnesses = (try parse(&.{ "--vm-witness", "one.js", "two.js" })).vm_witness;
81+
try std.testing.expectEqual(@as(usize, 2), witnesses.len);
82+
try expectTag(.list_skips, &.{"--list-skips"});
83+
try expectTag(.list_excluded, &.{"--list-excluded"});
84+
}
85+
86+
test "test262 CLI usage documents every accepted named mode" {
87+
for ([_][]const u8{
88+
"--help",
89+
"--worker",
90+
"--drive-subtree",
91+
"--diag",
92+
"--eval",
93+
"--vm-witness",
94+
"--list-skips",
95+
"--list-excluded",
96+
}) |mode| try std.testing.expect(std.mem.indexOf(u8, usage, mode) != null);
97+
}
98+
99+
test "test262 CLI rejects unknown incomplete malformed and trailing arguments" {
100+
const invalid = [_][]const []const u8{
101+
&.{"--unknown"},
102+
&.{ "--help", "extra" },
103+
&.{"--worker"},
104+
&.{ "--worker", "test/language", "bad", "4" },
105+
&.{ "--worker", "test/language", "0", "bad" },
106+
&.{ "--drive-subtree", "test/language", "extra" },
107+
&.{"--diag"},
108+
&.{ "--diag", "test/language", "filter", "extra" },
109+
&.{"--eval"},
110+
&.{ "--eval", "probe.js", "extra" },
111+
&.{"--vm-witness"},
112+
&.{ "--list-skips", "extra" },
113+
&.{ "--list-excluded", "extra" },
114+
};
115+
for (invalid) |args| try std.testing.expectError(error.InvalidArguments, parse(args));
116+
}

0 commit comments

Comments
 (0)