summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.zig28
-rw-r--r--test/hxdiff.zig92
-rw-r--r--test/lspbench.zig50
3 files changed, 6 insertions, 164 deletions
diff --git a/build.zig b/build.zig
index fd3c76f1..7e9dff9f 100644
--- a/build.zig
+++ b/build.zig
@@ -1583,9 +1583,6 @@ pub fn build(b: *std.Build) void {
if (test_nonce) |nonce| perf_tests.root_module.addImport("test_rebuild_nonce", nonce);
const run_perf_test = b.addRunArtifact(perf_tests);
run_perf_test.has_side_effects = true;
- const perf_test_step = b.step("perf-test", "test performance options and baselines without compiling the editor");
- perf_test_step.dependOn(&run_perf_test.step);
- if (testMatch(b, unit_profile, test_filters, perf_test_step)) |check| check.addArtifactArg(perf_tests);
const fs_bench = b.addExecutable(.{
.name = "pardes-fs-bench",
@@ -1613,9 +1610,6 @@ pub fn build(b: *std.Build) void {
});
const run_fs_bench_test = b.addRunArtifact(fs_bench_test);
run_fs_bench_test.has_side_effects = true;
- const fs_bench_test_step = b.step("fs-bench-test", "test filesystem benchmark options without compiling the editor");
- fs_bench_test_step.dependOn(&run_fs_bench_test.step);
- if (testMatch(b, unit_profile, test_filters, fs_bench_test_step)) |check| check.addArtifactArg(fs_bench_test);
const syntax_module = b.createModule(.{
.target = target,
@@ -1687,22 +1681,12 @@ pub fn build(b: *std.Build) void {
// contrast search per grapheme costs 100x, far past the gate).
unit_step.dependOn(perf_gate_step);
const unit_match = testMatch(b, unit_profile, test_filters, unit_step);
- const lspbench_tests = b.addTest(.{ .root_module = lspbench.root_module, .filters = test_filters });
- const run_lspbench_tests = b.addRunArtifact(lspbench_tests);
- run_lspbench_tests.has_side_effects = true;
- const lspbench_test_step = b.step("lspbench-test", "test language benchmark completeness and correctness gates");
- lspbench_test_step.dependOn(&run_lspbench_tests.step);
- if (testMatch(b, unit_profile, test_filters, lspbench_test_step)) |check| check.addArtifactArg(lspbench_tests);
- const diff_tests = b.addTest(.{ .root_module = hxdiff.root_module, .filters = test_filters });
- const run_diff_tests = b.addRunArtifact(diff_tests);
- run_diff_tests.has_side_effects = true;
- const diff_test_step = b.step("hxdiff-test", "test differential comparison, allocation failures and CLI regression gates");
- diff_test_step.dependOn(&run_diff_tests.step);
- if (testMatch(b, unit_profile, test_filters, diff_test_step)) |check| check.addArtifactArg(diff_tests);
- const run_diff_cli = b.addRunArtifact(hxdiff);
- run_diff_cli.addArg("--self-test");
- run_diff_cli.has_side_effects = true;
- diff_test_step.dependOn(&run_diff_cli.step);
+ // The perf and fs bench programs' own tests: they compile no editor.
+ for ([_]*std.Build.Step.Compile{ perf_tests, fs_bench_test }, [_]*std.Build.Step.Run{ run_perf_test, run_fs_bench_test }) |t, run| {
+ test_build.dependOn(&t.step);
+ unit_step.dependOn(&run.step);
+ if (unit_match) |check| check.addArtifactArg(t);
+ }
const core_test = b.addTest(.{ .root_module = core_module, .filters = test_filters });
const run_core_test = b.addRunArtifact(core_test);
run_core_test.has_side_effects = true;
diff --git a/test/hxdiff.zig b/test/hxdiff.zig
index 257cce42..1cb4d86f 100644
--- a/test/hxdiff.zig
+++ b/test/hxdiff.zig
@@ -31,7 +31,6 @@ pub fn main(init: std.process.Init) !void {
defer arena_state.deinit();
const arena = arena_state.allocator();
const args = try init.minimal.args.toSlice(init.arena.allocator());
- if (args.len == 2 and std.mem.eql(u8, args[1], "--self-test")) return testCli(init);
var parity = false;
var verbose = false;
@@ -575,97 +574,6 @@ fn fatal(comptime fmt: []const u8, args: anytype) noreturn {
std.process.exit(1);
}
-fn testCli(init: std.process.Init) !void {
- const io = init.io;
- const arena = init.arena.allocator();
- const exe = try std.process.executablePathAlloc(io, arena);
- var random: [12]u8 = undefined;
- io.random(&random);
- const path = try std.fmt.allocPrint(arena, "hxdiff-{x}", .{random});
- var parent = try std.Io.Dir.cwd().createDirPathOpen(io, ".zig-cache/tmp", .{});
- defer parent.close(io);
- try parent.createDir(io, path, .default_dir);
- defer parent.deleteTree(io, path) catch {};
- var dir = try parent.openDir(io, path, .{});
- defer dir.close(io);
-
- const case_a = "{\"name\":\"a\",\"text\":\"a\\n\",\"keys\":\"\"}\n";
- const case_b = "{\"name\":\"b\",\"text\":\"b\\n\",\"keys\":\"\"}\n";
- const result_tail = ",\"mode\":\"normal\",\"cursor\":{\"row\":0,\"col\":0},\"anchor\":{\"row\":0,\"col\":0}}";
- const result_a = "{\"name\":\"a\",\"text\":\"a\\n\"" ++ result_tail;
- const result_b = "{\"name\":\"b\",\"text\":\"b\\n\"" ++ result_tail;
- const different = "{\"name\":\"a\",\"text\":\"different\\n\"" ++ result_tail;
- const changed = "{\"name\":\"a\",\"text\":\"changed\\n\"" ++ result_tail;
- const waiver = "{\"name\":\"a\",\"reason\":\"fixture\",\"reference\":" ++ different ++ ",\"expected\":" ++ result_a ++ "}\n";
- const missing_waiver = "{\"name\":\"b\",\"reason\":\"fixture\",\"reference\":" ++ result_b ++ ",\"expected\":" ++ result_b ++ "}\n";
- const Fixture = struct {
- name: []const u8,
- cases: []const u8 = case_a,
- reference: []const u8 = result_a,
- waivers: []const u8 = "",
- args: []const []const u8 = &.{ "--strict", "cases", "reference", "waivers" },
- message: []const u8 = "",
- };
- const fixtures = [_]Fixture{
- .{ .name = "equal" },
- .{ .name = "subset", .reference = result_a ++ "\n" ++ result_b, .args = &.{ "cases", "reference" } },
- .{ .name = "missing reference", .cases = case_a ++ case_b, .message = "no golden for case b" },
- .{ .name = "unused reference", .reference = result_a ++ "\n" ++ result_b, .message = "UnusedReferenceCases" },
- .{ .name = "empty corpus", .cases = "\n", .reference = "", .message = "NoCases" },
- .{ .name = "duplicate cases", .cases = case_a ++ case_a, .message = "duplicate case name" },
- .{ .name = "duplicate references", .reference = result_a ++ "\n" ++ result_a, .message = "duplicate golden name" },
- .{ .name = "empty name", .cases = "{\"name\":\"\",\"text\":\"a\",\"keys\":\"\"}\n", .message = "empty or duplicate case name" },
- .{ .name = "mismatch", .reference = different, .message = "MISMATCH a" },
- .{ .name = "pinned waiver", .reference = different, .waivers = waiver },
- .{ .name = "changed actual", .cases = "{\"name\":\"a\",\"text\":\"changed\\n\",\"keys\":\"\"}\n", .reference = different, .waivers = waiver, .message = "CHANGED WAIVER a" },
- .{ .name = "changed reference", .reference = changed, .waivers = waiver, .message = "CHANGED WAIVER a" },
- .{ .name = "stale waiver", .waivers = waiver, .message = "stale waiver: a" },
- .{ .name = "unused waiver", .waivers = missing_waiver, .message = "unused waiver: b" },
- .{ .name = "duplicate waivers", .reference = different, .waivers = waiver ++ waiver, .message = "duplicate waiver name" },
- .{ .name = "unknown case field", .cases = "{\"name\":\"a\",\"text\":\"a\\n\",\"keys\":\"\",\"typo\":true}\n", .message = "UnknownField" },
- .{ .name = "unknown reference field", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"typo\":true" ++ result_tail, .message = "UnknownField" },
- .{ .name = "unknown mode", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"mode\":\"unknown\",\"cursor\":{\"row\":0,\"col\":0},\"anchor\":{\"row\":0,\"col\":0}}\n", .message = "UnknownMode" },
- .{ .name = "primary without selections", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"primary\":0" ++ result_tail, .message = "PrimaryWithoutSelections" },
- .{ .name = "empty selections", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"sels\":[]" ++ result_tail, .message = "NotMultipleSelections" },
- .{ .name = "missing waiver argument", .args = &.{ "cases", "--waivers" }, .message = "usage:" },
- .{ .name = "flag instead of waiver path", .args = &.{ "cases", "--waivers", "--strict" }, .message = "MissingWaiverPath" },
- .{ .name = "duplicate waiver option", .args = &.{ "cases", "reference", "--waivers", "waivers", "--waivers", "waivers" }, .message = "DuplicateWaiverPath" },
- .{ .name = "positional and named waiver", .args = &.{ "cases", "reference", "waivers", "--waivers", "waivers" }, .message = "DuplicateWaiverPath" },
- .{ .name = "unknown option", .args = &.{ "cases", "--typo" }, .message = "UnknownOption" },
- .{ .name = "too many paths", .args = &.{ "cases", "reference", "waivers", "extra" }, .message = "TooManyPaths" },
- .{ .name = "waivers without comparison", .args = &.{ "cases", "--waivers", "waivers" }, .message = "WaiversNeedComparison" },
- .{ .name = "conflicting pane modes", .args = &.{ "--parity", "--pane=file", "cases" }, .message = "ConflictingPaneModes" },
- .{ .name = "unknown pane", .args = &.{ "--pane=unknown", "cases" }, .message = "UnknownPane" },
- .{ .name = "parity", .args = &.{ "--parity", "--strict", "cases" } },
- .{ .name = "parity option after path", .args = &.{ "cases", "--strict", "--parity" } },
- .{ .name = "emit", .args = &.{"cases"} },
- };
- for (fixtures) |fixture| {
- try dir.writeFile(io, .{ .sub_path = "cases", .data = fixture.cases });
- try dir.writeFile(io, .{ .sub_path = "reference", .data = fixture.reference });
- try dir.writeFile(io, .{ .sub_path = "waivers", .data = fixture.waivers });
- const argv = try arena.alloc([]const u8, fixture.args.len + 1);
- argv[0] = exe;
- @memcpy(argv[1..], fixture.args);
- const result = try std.process.run(arena, io, .{
- .argv = argv,
- .cwd = .{ .dir = dir },
- .stdout_limit = .limited(1024 * 1024),
- .stderr_limit = .limited(1024 * 1024),
- .timeout = .{ .duration = .{ .clock = .awake, .raw = .fromSeconds(5) } },
- });
- const passed = result.term == .exited and result.term.exited == 0;
- if (result.term != .exited or passed != (fixture.message.len == 0) or
- std.mem.indexOf(u8, result.stderr, fixture.message) == null)
- {
- std.debug.print("CLI fixture {s}: {s}\n{s}\n", .{ fixture.name, result.stdout, result.stderr });
- return error.DifferentialDriverTestFailed;
- }
- if (std.mem.eql(u8, fixture.name, "emit") and !std.mem.eql(u8, result.stdout, result_a ++ "\n")) return error.WrongEmittedResult;
- }
- std.debug.print("hxdiff: {d} CLI regression fixtures passed\n", .{fixtures.len});
-}
-
test "differential cases deliver each Unicode scalar as one key event" {
var arena_state: std.heap.ArenaAllocator = .init(std.testing.allocator);
defer arena_state.deinit();
diff --git a/test/lspbench.zig b/test/lspbench.zig
index 87b6d83e..9857b61c 100644
--- a/test/lspbench.zig
+++ b/test/lspbench.zig
@@ -89,27 +89,6 @@ const Options = struct {
}
};
-test "lspbench options reject unknown flags and multiple roots before probing" {
- const defaults = try Options.parse(&.{});
- try std.testing.expect(!defaults.json and !defaults.check);
- try std.testing.expectEqualStrings(".", defaults.root);
- for ([_][]const []const u8{
- &.{ "--json", "repo root", "--check" },
- &.{ "repo root", "--check", "--json" },
- }) |args| {
- const options = try Options.parse(args);
- try std.testing.expect(options.json and options.check);
- try std.testing.expectEqualStrings("repo root", options.root);
- }
- for ([_][]const []const u8{
- &.{ "--reps", "3" },
- &.{ "--json", "--unknown" },
- &.{ "repo", "--check=true" },
- }) |args| try std.testing.expectError(error.UnknownArgument, Options.parse(args));
- try std.testing.expectError(error.MultipleRoots, Options.parse(&.{ "first", "second" }));
- try std.testing.expectError(error.MultipleRoots, Options.parse(&.{ "first", "--check", "second" }));
-}
-
/// The process's Io, for the queries: their waits are woken by the client's
/// reader threads, which a single-threaded Io cannot be.
var query_io: std.Io = undefined;
@@ -194,35 +173,6 @@ fn runOnce(gpa: std.mem.Allocator, req_in: lsp.Req, expected: []const u8, r: *Re
return ns / 1000;
}
-test "lspbench check rejects omitted empty and incorrect probes" {
- var result: Result = .{ .kind = .definition };
- try std.testing.expectError(error.MissingProbes, checkResults(&.{}, 1));
- try std.testing.expectError(error.IncorrectProbe, checkResults(&.{result}, 1));
- result.accept("actual.zig:1:1: symbol\n", "expected.zig");
- try std.testing.expect(!result.empty);
- try std.testing.expectError(error.IncorrectProbe, checkResults(&.{result}, 1));
- result.accept("actual.zig:1:1: symbol\n", "actual.zig");
- try checkResults(&.{result}, 1);
- try std.testing.expectError(error.MissingProbes, checkResults(&.{result}, 2));
- result.accept("", "");
- try std.testing.expectError(error.IncorrectProbe, checkResults(&.{result}, 1));
-}
-
-test "lspbench reports missing fixture and anchor before querying a backend" {
- var tmp = std.testing.tmpDir(.{});
- defer tmp.cleanup();
- var path_buf: [4096]u8 = undefined;
- const root = path_buf[0..try tmp.dir.realPath(std.testing.io, &path_buf)];
- const anchor: Anchor = .{ .file = "source.zig", .needle = "pub const value", .kind = .definition };
- try std.testing.expectError(error.OpenFailed, probe(std.testing.allocator, root, anchor));
- try tmp.dir.writeFile(std.testing.io, .{ .sub_path = anchor.file, .data = "const value = 1;\n" });
- try std.testing.expectError(error.MissingAnchor, probe(std.testing.allocator, root, anchor));
- var invalid = anchor;
- invalid.needle = "value";
- invalid.at = 6;
- try std.testing.expectError(error.InvalidAnchor, probe(std.testing.allocator, root, invalid));
-}
-
fn reportText(rs: []const Result, rss: u64) void {
const o = std.debug.print;
o("backend: {s}\n\n", .{lsp.backend_name});