fix: honor discovery-mode CLI options

Review threads live on the whole diff, not on one commit, so none are shown here - a thread's line means something in the branch's final form, and painting it into an intermediate step would put it on code it is not about.

src/cli.zigmodified+83-1

Changes to src/cli.zig

		⋯10 linesShow the 10 lines above this hunk@@ -11,7 +11,7 @@ pub const CLIOptions = struct {
11	11	quiet: bool = false,
12	12	no_color: bool = false,
13	13	// Test discovery options
14		- test_dir: ?[]const u8 = null,
	14	+ test_dir: ?[]const u8 = ".",
15	15	pattern: []const u8 = "*.test.zig",
16	16	no_recursive: bool = false,
17	17	// Coverage options
		⋯122 linesShow the 122 lines above this hunk@@ -140,6 +140,12 @@ pub const CLI = struct {
140	140	}
141	141	i += 1;
142	142	self.options.coverage_tool = args[i];
	143	+ if (!std.mem.eql(u8, self.options.coverage_tool, "kcov") and
	144	+ !std.mem.eql(u8, self.options.coverage_tool, "grindcov"))
	145	+ {
	146	+ std.debug.print("Error: --coverage-tool must be 'kcov' or 'grindcov'\n", .{});
	147	+ return CLIError.InvalidArgument;
	148	+ }
143	149	} else if (std.mem.eql(u8, arg, "--parallel") or std.mem.eql(u8, arg, "-p")) {
144	150	self.options.parallel = true;
145	151	} else if (std.mem.eql(u8, arg, "--jobs") or std.mem.eql(u8, arg, "-j")) {
		⋯7 linesShow the 7 lines above this hunk@@ -153,6 +159,10 @@ pub const CLI = struct {
153	159	std.debug.print("Error: --jobs must be a valid number\n", .{});
154	160	return CLIError.InvalidArgument;
155	161	};
	162	+ if (self.options.jobs.? == 0) {
	163	+ std.debug.print("Error: --jobs must be greater than zero\n", .{});
	164	+ return CLIError.InvalidArgument;
	165	+ }
156	166	} else if (std.mem.eql(u8, arg, "--ui")) {
157	167	self.options.ui = true;
158	168	} else if (std.mem.eql(u8, arg, "--ui-port")) {
		⋯86 linesShow the 86 lines above this hunk@@ -245,6 +255,31 @@ pub const CLI = struct {
245	255	}
246	256	}
247	257
	258	+ /// Return the first option that discovery mode cannot currently honor.
	259	+ /// Discovery must reject these options explicitly instead of silently
	260	+ /// behaving differently from programmatic mode.
	261	+ pub fn unsupportedDiscoveryOption(self: Self) ?[]const u8 {
	262	+ if (!self.options.coverage and !std.mem.eql(u8, self.options.coverage_dir, "coverage")) return "--coverage-dir";
	263	+ if (!self.options.coverage and !std.mem.eql(u8, self.options.coverage_tool, "kcov")) return "--coverage-tool";
	264	+ if (!self.options.watch and self.options.watch_debounce != 300) return "--watch-debounce";
	265	+ if (!self.options.ui and self.options.ui_port != 8080) return "--ui-port";
	266	+ if (!self.options.ui and !std.mem.eql(u8, self.options.ui_host, "127.0.0.1")) return "--ui-host";
	267	+ if (self.options.reporter != .spec) return "--reporter";
	268	+ if (self.options.quiet) return "--quiet";
	269	+ if (self.options.parallel) return "--parallel";
	270	+ if (self.options.jobs != null) return "--jobs";
	271	+ if (self.options.update_snapshots) return "--update-snapshots";
	272	+ if (!std.mem.eql(u8, self.options.snapshot_dir, ".snapshots")) return "--snapshot-dir";
	273	+ if (self.options.profile_memory) return "--profile-memory";
	274	+ if (self.options.memory_threshold != 0) return "--memory-threshold";
	275	+ if (self.options.fail_on_leak) return "--fail-on-leak";
	276	+ if (self.options.config != null) return "--config";
	277	+ if (self.options.junit_output != null) return "--junit-output";
	278	+ if (self.options.timeout != null) return "--timeout";
	279	+ if (self.options.ui) return "--ui";
	280	+ return null;
	281	+ }
	282	+
248	283	/// Print help message
249	284	pub fn printHelp(self: Self) void {
250	285	_ = self;
		⋯216 linesShow the 216 lines above this hunk@@ -467,6 +502,7 @@ test "CLI default values" {
467	502	try std.testing.expectEqualStrings("coverage", cli.options.coverage_dir);
468	503	try std.testing.expectEqualStrings("kcov", cli.options.coverage_tool);
469	504	try std.testing.expectEqualStrings("*.test.zig", cli.options.pattern);
	505	+ try std.testing.expectEqualStrings(".", cli.options.test_dir.?);
470	506	try std.testing.expect(!cli.options.ui);
471	507	try std.testing.expectEqual(@as(u16, 8080), cli.options.ui_port);
472	508	try std.testing.expectEqualStrings("127.0.0.1", cli.options.ui_host);
		⋯58 linesShow the 58 lines above this hunk@@ -531,6 +567,52 @@ test "CLI parse timeout" {
531	567	try std.testing.expectEqual(@as(?u64, 5000), cli.options.timeout);
532	568	}
533	569
	570	+test "CLI rejects invalid coverage tool" {
	571	+ var cli = CLI.init(std.testing.allocator);
	572	+ const args = [_][]const u8{ "zig-test", "--coverage-tool", "unknown" };
	573	+ try std.testing.expectError(CLIError.InvalidArgument, cli.parse(&args));
	574	+}
	575	+
	576	+test "CLI rejects zero jobs" {
	577	+ var cli = CLI.init(std.testing.allocator);
	578	+ const args = [_][]const u8{ "zig-test", "--jobs", "0" };
	579	+ try std.testing.expectError(CLIError.InvalidArgument, cli.parse(&args));
	580	+}
	581	+
	582	+test "discovery accepts implemented options" {
	583	+ var cli = CLI.init(std.testing.allocator);
	584	+ const args = [_][]const u8{
	585	+ "zig-test",
	586	+ "--test-dir",
	587	+ "tests",
	588	+ "--filter",
	589	+ "math",
	590	+ "--no-color",
	591	+ "--bail",
	592	+ "--verbose",
	593	+ };
	594	+ try cli.parse(&args);
	595	+ try std.testing.expectEqual(@as(?[]const u8, null), cli.unsupportedDiscoveryOption());
	596	+}
	597	+
	598	+test "discovery identifies unsupported options" {
	599	+ var cli = CLI.init(std.testing.allocator);
	600	+ const args = [_][]const u8{ "zig-test", "--test-dir", "tests", "--reporter", "json" };
	601	+ try cli.parse(&args);
	602	+ try std.testing.expectEqualStrings("--reporter", cli.unsupportedDiscoveryOption().?);
	603	+}
	604	+
	605	+test "discovery reports timeout and parallel options as unsupported" {
	606	+ var cli = CLI.init(std.testing.allocator);
	607	+
	608	+ cli.options.timeout = 1000;
	609	+ try std.testing.expectEqualStrings("--timeout", cli.unsupportedDiscoveryOption().?);
	610	+
	611	+ cli.options.timeout = null;
	612	+ cli.options.parallel = true;
	613	+ try std.testing.expectEqualStrings("--parallel", cli.unsupportedDiscoveryOption().?);
	614	+}
	615	+
534	616	test "CLI parse update-snapshots short flag" {
535	617	var cli = CLI.init(std.testing.allocator);
536	618	const args = [_][]const u8{ "zig-test", "-u" };

src/coverage.zigmodified+12-0

Changes to src/coverage.zig

		⋯167 linesShow the 167 lines above this hunk@@ -168,6 +168,16 @@ pub fn runTestWithCoverage(
168	168	allocator: std.mem.Allocator,
169	169	test_file_path: []const u8,
170	170	options: CoverageOptions,
	171	+) !bool {
	172	+ return runTestWithCoverageArgs(allocator, test_file_path, &.{}, options);
	173	+}
	174	+
	175	+/// Run a test file with coverage while forwarding Zig test arguments.
	176	+pub fn runTestWithCoverageArgs(
	177	+ allocator: std.mem.Allocator,
	178	+ test_file_path: []const u8,
	179	+ test_args: []const []const u8,
	180	+ options: CoverageOptions,
171	181	) !bool {
172	182	if (!options.enabled) {
173	183	return error.CoverageNotEnabled;
		⋯15 linesShow the 15 lines above this hunk@@ -189,6 +199,7 @@ pub fn runTestWithCoverage(
189	199	try argv.append(allocator, "zig");
190	200	try argv.append(allocator, "test");
191	201	try argv.append(allocator, test_file_path);
	202	+ try argv.appendSlice(allocator, test_args);
192	203
193	204	const term = try compat.spawnAndWait(allocator, argv.items, .Inherit, .Inherit);
194	205	return switch (term) {
		⋯15 linesShow the 15 lines above this hunk@@ -210,6 +221,7 @@ pub fn runTestWithCoverage(
210	221	try argv.append(allocator, "zig");
211	222	try argv.append(allocator, "test");
212	223	try argv.append(allocator, test_file_path);
	224	+ try argv.appendSlice(allocator, test_args);
213	225
214	226	switch (options.tool) {
215	227	.kcov => {

src/lib.zigmodified+1-0

Changes to src/lib.zig

		⋯115 linesShow the 115 lines above this hunk@@ -116,6 +116,7 @@ pub const CoverageResult = coverage.CoverageResult;
116	116	pub const CoverageTool = coverage.CoverageTool;
117	117	pub const runWithCoverage = coverage.runWithCoverage;
118	118	pub const runTestWithCoverage = coverage.runTestWithCoverage;
	119	+pub const runTestWithCoverageArgs = coverage.runTestWithCoverageArgs;
119	120	pub const parseCoverageReport = coverage.parseCoverageReport;
120	121	pub const printCoverageSummary = coverage.printCoverageSummary;
121	122	pub const isCoverageToolAvailable = coverage.isCoverageToolAvailable;

src/main.zigmodified+13-1

Changes to src/main.zig

		⋯73 linesShow the 73 lines above this hunk@@ -74,6 +74,16 @@ pub fn main(init: std.process.Init.Minimal) !void {
74	74	// Check if we should use test discovery or programmatic tests
75	75	const use_discovery = cli_parser.options.test_dir != null;
76	76
	77	+ if (use_discovery) {
	78	+ if (cli_parser.unsupportedDiscoveryOption()) |option| {
	79	+ std.debug.print(
	80	+ "Error: {s} cannot be honored in test discovery mode\n",
	81	+ .{option},
	82	+ );
	83	+ std.process.exit(2);
	84	+ }
	85	+ }
	86	+
77	87	// Start UI server if requested
78	88	var ui_server: ?lib.UIServer = null;
79	89	var ui_thread: ?std.Thread = null;
		⋯96 linesShow the 96 lines above this hunk@@ -176,6 +186,7 @@ pub fn main(init: std.process.Init.Minimal) !void {
176	186	.bail = cli_parser.options.bail,
177	187	.filter = cli_parser.options.filter,
178	188	.verbose = cli_parser.options.verbose,
	189	+ .use_colors = !cli_parser.options.no_color,
179	190	.coverage_options = cov_opts,
180	191	.ui_server = if (ui_server) |*server| server else null,
181	192	};
		⋯10 linesShow the 10 lines above this hunk@@ -192,7 +203,7 @@ pub fn main(init: std.process.Init.Minimal) !void {
192	203	.recursive = !cli_parser.options.no_recursive,
193	204	};
194	205
195		- std.debug.print("Discovering tests in '{s}' with pattern '*{s}'...\n\n", .{ discovery_options.root_path, discovery_options.pattern });
	206	+ std.debug.print("Discovering tests in '{s}' with pattern '{s}'...\n\n", .{ discovery_options.root_path, discovery_options.pattern });
196	207
197	208	var discovered = try lib.discoverTests(allocator, discovery_options);
198	209	defer discovered.deinit();
		⋯14 linesShow the 14 lines above this hunk@@ -213,6 +224,7 @@ pub fn main(init: std.process.Init.Minimal) !void {
213	224	.bail = cli_parser.options.bail,
214	225	.filter = cli_parser.options.filter,
215	226	.verbose = cli_parser.options.verbose,
	227	+ .use_colors = !cli_parser.options.no_color,
216	228	.coverage_options = cov_opts,
217	229	.ui_server = if (ui_server) |*server| server else null,
218	230	};

src/test_loader.zigmodified+45-3

Changes to src/test_loader.zig

		⋯11 linesShow the 11 lines above this hunk@@ -12,6 +12,8 @@ pub const LoaderOptions = struct {
12	12	filter: ?[]const u8 = null,
13	13	/// Whether to show verbose output
14	14	verbose: bool = false,
	15	+ /// Whether child Zig test processes may emit colors
	16	+ use_colors: bool = true,
15	17	/// Coverage options
16	18	coverage_options: ?coverage.CoverageOptions = null,
17	19	/// UI server for real-time updates
		⋯115 linesShow the 115 lines above this hunk@@ -133,27 +135,48 @@ fn runTestFile(
133	135	file_path: []const u8,
134	136	options: LoaderOptions,
135	137	) !bool {
	138	+ var test_args: std.ArrayList([]const u8) = .empty;
	139	+ defer test_args.deinit(allocator);
	140	+
	141	+ try appendTestArgs(allocator, &test_args, options);
	142	+
136	143	// If coverage is enabled, use coverage.runTestWithCoverage
137	144	if (options.coverage_options) |cov_opts| {
138	145	if (cov_opts.enabled) {
139	146	// Disable clean for individual test runs since we cleaned once at the start
140	147	var modified_opts = cov_opts;
141	148	modified_opts.clean = false;
142		- return coverage.runTestWithCoverage(allocator, file_path, modified_opts) catch |err| {
	149	+ return coverage.runTestWithCoverageArgs(allocator, file_path, test_args.items, modified_opts) catch |err| {
143	150	std.debug.print("Warning: Coverage failed for {s}: {any}\n", .{ file_path, err });
144	151	// Fall back to running without coverage
145		- return runTestFileWithoutCoverage(allocator, file_path);
	152	+ return runTestFileWithoutCoverage(allocator, file_path, test_args.items);
146	153	};
147	154	}
148	155	}
149	156
150		- return runTestFileWithoutCoverage(allocator, file_path);
	157	+ return runTestFileWithoutCoverage(allocator, file_path, test_args.items);
	158	+}
	159	+
	160	+fn appendTestArgs(
	161	+ allocator: std.mem.Allocator,
	162	+ args: *std.ArrayList([]const u8),
	163	+ options: LoaderOptions,
	164	+) !void {
	165	+ if (options.filter) |filter| {
	166	+ try args.append(allocator, "--test-filter");
	167	+ try args.append(allocator, filter);
	168	+ }
	169	+ if (!options.use_colors) {
	170	+ try args.append(allocator, "--color");
	171	+ try args.append(allocator, "off");
	172	+ }
151	173	}
152	174
153	175	/// Run a single test file without coverage
154	176	fn runTestFileWithoutCoverage(
155	177	allocator: std.mem.Allocator,
156	178	file_path: []const u8,
	179	+ test_args: []const []const u8,
157	180	) !bool {
158	181	// Build zig test command
159	182	var argv: std.ArrayList([]const u8) = .empty;
		⋯2 linesShow the 2 lines above this hunk@@ -162,6 +185,7 @@ fn runTestFileWithoutCoverage(
162	185	try argv.append(allocator, "zig");
163	186	try argv.append(allocator, "test");
164	187	try argv.append(allocator, file_path);
	188	+ try argv.appendSlice(allocator, test_args);
165	189
166	190	// Run the test
167	191	const term = try compat.spawnAndWait(allocator, argv.items, .Inherit, .Inherit);
		⋯14 linesShow the 14 lines above this hunk@@ -182,9 +206,27 @@ test "LoaderOptions default values" {
182	206	try std.testing.expectEqual(false, options.bail);
183	207	try std.testing.expectEqual(@as(?[]const u8, null), options.filter);
184	208	try std.testing.expectEqual(false, options.verbose);
	209	+ try std.testing.expectEqual(true, options.use_colors);
185	210	try std.testing.expectEqual(@as(?coverage.CoverageOptions, null), options.coverage_options);
186	211	}
187	212
	213	+test "test command options forward filter and color" {
	214	+ const allocator = std.testing.allocator;
	215	+ var args: std.ArrayList([]const u8) = .empty;
	216	+ defer args.deinit(allocator);
	217	+
	218	+ try appendTestArgs(allocator, &args, .{
	219	+ .filter = "selected test",
	220	+ .use_colors = false,
	221	+ });
	222	+
	223	+ try std.testing.expectEqual(@as(usize, 4), args.items.len);
	224	+ try std.testing.expectEqualStrings("--test-filter", args.items[0]);
	225	+ try std.testing.expectEqualStrings("selected test", args.items[1]);
	226	+ try std.testing.expectEqualStrings("--color", args.items[2]);
	227	+ try std.testing.expectEqualStrings("off", args.items[3]);
	228	+}
	229	+
188	230	test "LoaderOptions with custom values" {
189	231	const cov_opts = coverage.CoverageOptions{
190	232	.enabled = true,