summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-21 14:35:15 -0300
committerGabriel Schneider <[email protected]>2026-10-22 10:03:15 -0300
commitbc3d18d27f9fc1155db7fac3946c4d38774f9e65 (patch)
tree9178ce95952797f8a78b16c2b805e53368efb35a /test
parent1ecb9b720840ea8e4753823fa8cddcf5d6a3a4d2 (diff)
downloadpardes-bc3d18d27f9fc1155db7fac3946c4d38774f9e65.tar.gz
pardes-bc3d18d27f9fc1155db7fac3946c4d38774f9e65.zip
Build with Zig 0.17
ghostty, libvaxis and uucode move to ghostty's 0.17 pins, cloud9 to its 0.17 main, SDL to castholm's release-3.4.x (3.4.18), zstbi and tree-sitter to forks with 0.17 build files (see build.zig.zon). A bare zig build copies the binaries into ~/.local/bin (-Dhome-install=false leaves it out): 0.17 keeps the prefix from build scripts. A terminal's edited copy goes when the program clears the screen. tinywin.snap is gone; perf baselines are re-recorded. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Diffstat (limited to 'test')
-rw-r--r--test/deck/replay.zig5
-rw-r--r--test/deck/schema.zig10
-rw-r--r--test/e2e_harness.zig2
-rw-r--r--test/fs_bench.zig4
-rw-r--r--test/history.zig10
-rw-r--r--test/hxdiff.zig14
-rw-r--r--test/image_harness.zig2
-rw-r--r--test/lspbench.zig2
-rw-r--r--test/monkey.zig2
-rw-r--r--test/panes.zig50
-rw-r--r--test/pdf.zig8
-rw-r--r--test/pdf_scroll_bench.zig2
-rw-r--r--test/pdf_sections_bench.zig2
-rw-r--r--test/perf-baseline-gui-Debug.json1
-rw-r--r--test/perf-baseline-gui-debug.json1
-rw-r--r--test/perf-baseline-tty-Debug.json1
-rw-r--r--test/perf-baseline-tty-ReleaseFast.json1
-rw-r--r--test/perf-baseline-tty-debug.json1
-rw-r--r--test/perf-baseline-tty-fast.json1
-rw-r--r--test/perf.zig15
-rw-r--r--test/snapshot.zig40
-rw-r--r--test/snapshots/exec.golden8
-rw-r--r--test/snapshots/tinywin.golden83
-rw-r--r--test/snapshots/tinywin.snap31
-rw-r--r--test/unit_profile_test.zig7
25 files changed, 100 insertions, 203 deletions
diff --git a/test/deck/replay.zig b/test/deck/replay.zig
index 475f7476..49614b46 100644
--- a/test/deck/replay.zig
+++ b/test/deck/replay.zig
@@ -20,8 +20,9 @@ const Tally = struct {
fn replay(src: [:0]const u8) !Tally {
const gpa = std.testing.allocator;
- const rec = try schema.parse(gpa, src);
- defer schema.free(gpa, rec);
+ var arena: std.heap.ArenaAllocator = .init(gpa);
+ defer arena.deinit();
+ const rec = try schema.parse(gpa, arena.allocator(), src);
var d: deck.Deck = .{};
var tally: Tally = .{};
for (rec.events) |ev| {
diff --git a/test/deck/schema.zig b/test/deck/schema.zig
index 782c829a..401e15e8 100644
--- a/test/deck/schema.zig
+++ b/test/deck/schema.zig
@@ -61,10 +61,8 @@ pub const Event = struct {
};
};
-pub fn parse(gpa: std.mem.Allocator, src: [:0]const u8) error{ OutOfMemory, ParseZon }!Recording {
- return std.zon.parse.fromSliceAlloc(Recording, gpa, src, null, .{});
-}
-
-pub fn free(gpa: std.mem.Allocator, rec: Recording) void {
- std.zon.parse.free(gpa, rec);
+/// The recording's slices live in `arena`.
+pub fn parse(gpa: std.mem.Allocator, arena: std.mem.Allocator, src: [:0]const u8) error{ OutOfMemory, ParseZon }!Recording {
+ var diagnostics: std.zon.parse.Diagnostics = undefined;
+ return std.zon.parse.fromSlice(Recording, .{ .gpa = gpa, .arena = arena, .source = src, .diagnostics = &diagnostics });
}
diff --git a/test/e2e_harness.zig b/test/e2e_harness.zig
index 9e67c49f..a2010c19 100644
--- a/test/e2e_harness.zig
+++ b/test/e2e_harness.zig
@@ -104,7 +104,7 @@ pub const Harness = struct {
term.* = try ghostty_vt.Terminal.init(std.Io.Threaded.global_single_threaded.io(), gpa, .{
.cols = cols,
.rows = rows,
- .max_scrollback = 1024 * 1024,
+ .max_scrollback_bytes = 1024 * 1024,
});
errdefer term.deinit(gpa);
// vtStream() captures a pointer to `term`; term is heap-allocated so the
diff --git a/test/fs_bench.zig b/test/fs_bench.zig
index 746fe737..4764049f 100644
--- a/test/fs_bench.zig
+++ b/test/fs_bench.zig
@@ -272,7 +272,7 @@ pub fn main(init: std.process.Init) !void {
.tag = 9,
.op = .write,
.node = s.node(.body),
- .data = "x" ** 1024,
+ .data = &@as([1024]u8, @splat('x')),
.size = 1024,
}, "append: whole-body swap + undo snapshot");
@@ -327,7 +327,7 @@ pub fn main(init: std.process.Init) !void {
try w.writeAll("]}\n");
} else {
try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "request", "ns/op", "allocs", "note" });
- try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "-" ** 26, "-" ** 9, "-" ** 8, "-" ** 20 });
+ try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ &@as([26]u8, @splat('-')), &@as([9]u8, @splat('-')), &@as([8]u8, @splat('-')), &@as([20]u8, @splat('-')) });
for (rows.items) |r|
try w.print("{s:<26} {d:>9} {d:>8} {s}\n", .{ r.name, r.ns, r.allocs, r.note });
}
diff --git a/test/history.zig b/test/history.zig
index 5ce45239..d399f7aa 100644
--- a/test/history.zig
+++ b/test/history.zig
@@ -432,24 +432,24 @@ test "history benchmark cases are nonempty unique and matched by name" {
try std.testing.expectError(error.MissingField, readBenchmarks(arena, "{\"case\":\"first\"}"));
const before = try readBenchmarks(arena, benchmark_fixture);
const missing = try readBenchmarks(arena, "{\"case\":\"first\",\"bytes\":10,\"median_ns\":100,\"cold_ns\":100,\"allocations\":10,\"allocated_bytes\":1000}");
- try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, .{missing} ** 4, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), @splat(missing), null, &report.writer));
const renamed =
\\{"case":"first","bytes":10,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
\\{"case":"renamed","bytes":20,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
;
const different = try readBenchmarks(arena, renamed);
- try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, .{different} ** 4, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), @splat(different), null, &report.writer));
const reordered =
\\{"case":"last","bytes":20,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
\\{"case":"first","bytes":10,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
;
const same = try readBenchmarks(arena, reordered);
- try std.testing.expect(!try compareBenchmarks(.{before} ** 4, .{same} ** 4, 1, &report.writer));
+ try std.testing.expect(!try compareBenchmarks(@splat(before), @splat(same), 1, &report.writer));
var samples = [4][]Benchmark{ before, before, before, different };
- try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, samples, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), samples, null, &report.writer));
samples[3] = try arena.dupe(Benchmark, before);
samples[3][0].bytes += 1;
- try std.testing.expectError(error.DifferentBenchmarkInputs, compareBenchmarks(.{before} ** 4, samples, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarkInputs, compareBenchmarks(@splat(before), samples, null, &report.writer));
}
test "history benchmark gate uses repeated process captures rather than the first process alone" {
diff --git a/test/hxdiff.zig b/test/hxdiff.zig
index 48c7ab93..b12bcd8e 100644
--- a/test/hxdiff.zig
+++ b/test/hxdiff.zig
@@ -39,7 +39,7 @@ pub fn main(init: std.process.Init) !void {
var pane_override: ?[]const u8 = null;
var goldens_path: ?[]const u8 = null;
var waivers_path: ?[]const u8 = null;
- const paths = try arena.alloc([]const u8, args.len - 1);
+ const paths = try arena.alloc([]const u8, @max(args.len - 1, 3)); // room for the defaults below
var n_paths: usize = 0;
var want_waivers = false;
for (args[1..]) |a| {
@@ -67,6 +67,18 @@ pub fn main(init: std.process.Init) !void {
n_paths += 1;
}
}
+ // Named nothing (`zig build hxdiff` or `hxparity` bare): the checked-in
+ // suite, run from the repository root.
+ if (n_paths == 0 and !want_waivers) {
+ strict = true;
+ const defaults: []const []const u8 = if (parity)
+ &.{ "test/hxcases/cases.jsonl", "test/hxcases/parity.jsonl" }
+ else
+ &.{ "test/hxcases/cases.jsonl", "test/hxcases/goldens.jsonl", "test/hxcases/waivers.jsonl" };
+ if (parity) waivers_path = waivers_path orelse "test/hxcases/parity-waivers.jsonl";
+ @memcpy(paths[0..defaults.len], defaults);
+ n_paths = defaults.len;
+ }
if (n_paths == 0 or want_waivers)
fatal("usage: pardes-hxdiff [--parity] <cases.jsonl>... [goldens.jsonl [waivers.jsonl]]", .{});
const case_paths = paths[0..if (parity) n_paths else 1];
diff --git a/test/image_harness.zig b/test/image_harness.zig
index 474ec48b..b45851cc 100644
--- a/test/image_harness.zig
+++ b/test/image_harness.zig
@@ -38,7 +38,7 @@ pub fn main(init: std.process.Init) !void {
const args = try init.minimal.args.toSlice(arena);
if (args.len != 3 and args.len != 4) return error.BadArgs;
- const exe = try arena.dupeZ(u8, args[1]);
+ const exe = try arena.dupeSentinel(u8, args[1], 0);
const backend = args[2];
const pdf_mode = args.len == 4 and std.mem.eql(u8, args[3], "pdf");
if (args.len == 4 and !pdf_mode) return error.BadArgs;
diff --git a/test/lspbench.zig b/test/lspbench.zig
index 02138d24..d0e25aee 100644
--- a/test/lspbench.zig
+++ b/test/lspbench.zig
@@ -216,7 +216,7 @@ fn reportText(rs: []const Result, rss: u64) void {
const o = std.debug.print;
o("backend: {s}\n\n", .{lsp.backend_name});
o("{s:<24} {s:>9} {s:>7} {s:>10} {s:>10} {s}\n", .{ "kind", "supports", "rows", "cold(us)", "warm(us)", "verdict" });
- o("{s}\n", .{"-" ** 78});
+ o("{s}\n", .{&@as([78]u8, @splat('-'))});
var claimed: usize = 0;
var working: usize = 0;
var lies: usize = 0;
diff --git a/test/monkey.zig b/test/monkey.zig
index 83869ce4..dcea0b43 100644
--- a/test/monkey.zig
+++ b/test/monkey.zig
@@ -44,7 +44,7 @@ fn generate(gpa: std.mem.Allocator, seed: u64, steps: usize) ![]u8 {
var s: Script = .{ .gpa = gpa };
try s.line("# pardes-monkey seed {d}, {d} steps", .{ seed, steps });
try s.line("file bad.txt hello \\xff\\xfe world\\nlatin-1 caf\\xe9 tail\\ntruncated \\xe6\\x97 here\\nend\\n", .{});
- try s.line("file wide.txt {s}tail\\nsecond line\\n", .{"\\xe6\\x97\\xa5\\xe6\\x9c\\xac\\xe8\\xaa\\x9e " ** 8});
+ try s.line("file wide.txt {s}tail\\nsecond line\\n", .{std.mem.asBytes(&@as([8][37]u8, @splat("\\xe6\\x97\\xa5\\xe6\\x9c\\xac\\xe8\\xaa\\x9e ".*)))});
try s.line("lines long.txt 400 some words after the number, long enough to wrap in a narrow pane", .{});
try s.line("start 24 80 bad.txt", .{});
try s.line("wait 8000 Newcol Joincol", .{});
diff --git a/test/panes.zig b/test/panes.zig
index 86e52838..54100f91 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -42,7 +42,7 @@ const TagLayerTests = struct {
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 5, .tagline_h = 10 };
p.gpa.free(pane.file.?.path);
pane.file.?.path = try p.gpa.dupe(u8, "/x");
- try setTag(pane, " " ++ "a" ** 38 ++ "\t界 END");
+ try setTag(pane, " " ++ &@as([38]u8, @splat('a')) ++ "\t界 END");
var frame = std.heap.ArenaAllocator.init(p.gpa);
defer frame.deinit();
_ = try p.render(frame.allocator());
@@ -135,7 +135,7 @@ const TagLayerTests = struct {
try std.testing.expectEqual(@as(i32, 0), p.panes[second].?.input.cur_col);
p.update(.{ .key = .{ .cp = Key.escape } });
const left = p.panes[0].?;
- try setTag(left, " " ++ "a" ** 110);
+ try setTag(left, " " ++ &@as([110]u8, @splat('a')));
_ = try p.render(frame.allocator());
const left_layer = try findLayer(p, .pane, 0);
const left_text = try pardes.tagline.tagText(p, frame.allocator(), left);
@@ -149,7 +149,7 @@ const TagLayerTests = struct {
try std.testing.expectEqual(panes.File.rawAtDisplay(left_text, end_col), @as(usize, @intCast(left.tag.cur_col)));
try std.testing.expect(left.sel[0].state == .done and left.sel[0].r0 == 0);
p.update(.{ .key = .{ .cp = Key.escape } });
- const long = "a" ** 60 ++ "界END";
+ const long = &@as([60]u8, @splat('a')) ++ "界END";
p.global_tag.own = try p.gpa.dupe(u8, long);
for (p.col_tags[0..p.ncol]) |*tag| tag.own = try p.gpa.dupe(u8, long);
_ = try p.render(frame.allocator());
@@ -581,7 +581,7 @@ const BodyHitTests = struct {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 };
- const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 60 ++ " }\n};\n");
+ const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([60][16]u8, @splat(" // body\n".*))) ++ " }\n};\n");
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
pane.scrollBy(10);
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -629,7 +629,7 @@ const LineNumberLookTests = struct {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 };
- const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 60 ++ " }\n};\n");
+ const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([60][16]u8, @splat(" // body\n".*))) ++ " }\n};\n");
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
pane.scrollBy(30);
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -686,7 +686,7 @@ const TreeContextTests = struct {
if (!syntax.enabled) return error.SkipZigTest;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
- const pane = try setZigFile(p, "const Box = struct {\n\n // omitted member comment\n\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 30 ++ " }\n};\n");
+ const pane = try setZigFile(p, "const Box = struct {\n\n // omitted member comment\n\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([30][16]u8, @splat(" // body\n".*))) ++ " }\n};\n");
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 };
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
pane.scrollBy(10);
@@ -717,7 +717,7 @@ const TreeContextTests = struct {
if (context and !syntax.enabled) continue;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
- const pane = try setZigFile(p, "pub fn work() void {\n" ++ " // body\n" ** 100 ++ "}\n");
+ const pane = try setZigFile(p, "pub fn work() void {\n" ++ std.mem.asBytes(&@as([100][12]u8, @splat(" // body\n".*))) ++ "}\n");
if (context) try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
var frame = std.heap.ArenaAllocator.init(p.gpa);
defer frame.deinit();
@@ -792,7 +792,7 @@ const TreeContextTests = struct {
if (!syntax.enabled) return error.SkipZigTest;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 48, .rows = 14 });
defer p.deinit();
- const pane = try setZigFile(p, "pub fn @\"界name\"(\n\tvalue: usize,\n) void {\n" ++ " _ = value;\n" ** 12 ++ "}\n");
+ const pane = try setZigFile(p, "pub fn @\"界name\"(\n\tvalue: usize,\n) void {\n" ++ std.mem.asBytes(&@as([12][15]u8, @splat(" _ = value;\n".*))) ++ "}\n");
pane.tag_expanded = false; // a one-row tag keeps this small screen's rows
p.sync();
p.settings.wrap = false;
@@ -820,7 +820,7 @@ const TreeContextTests = struct {
// Read the body top again: the click cleared the announcement band the
// builtin above put up, so the body moved with it.
try std.testing.expectEqual(p.bodyTop(pane, p.rects[0]), cursor.y);
- panes.File.setContent(p, &pane.file.?, try p.gpa.dupe(u8, "// no enclosing declaration\n" ** 18));
+ panes.File.setContent(p, &pane.file.?, try p.gpa.dupe(u8, std.mem.asBytes(&@as([18][28]u8, @splat("// no enclosing declaration\n".*)))));
_ = try p.render(frame.allocator());
try std.testing.expectEqual(@as(u16, 0), pane.context_rows);
try std.testing.expectEqual(pane.scroll(), pane.wrapAt(0).line);
@@ -942,7 +942,7 @@ const TtySelectionTests = struct {
try noChildInput(p);
_ = try p.render(frame.allocator());
try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
- p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]133;C\x07" ++ "\r\nnew output" ** 30 } });
+ p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]133;C\x07" ++ std.mem.asBytes(&@as([30][12]u8, @splat("\r\nnew output".*))) } });
_ = try p.render(frame.allocator());
try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
@@ -1266,7 +1266,7 @@ const ClickCursorTests = struct {
test "click operands and hover follow the scrolled source selection" {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 40, .rows = 14 });
defer p.deinit();
- const pane = try p.setTestFile("zero\none\ntwo\nthree\nalpha beta\nfive\ngamma delta\nseven\n" ++ "tail\n" ** 20);
+ const pane = try p.setTestFile("zero\none\ntwo\nthree\nalpha beta\nfive\ngamma delta\nseven\n" ++ std.mem.asBytes(&@as([20][5]u8, @splat("tail\n".*))));
p.presentation.enabled = false;
p.settings.wrap = false;
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -1323,7 +1323,7 @@ const JumpSelectionTests = struct {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 34, .rows = 10 });
defer p.deinit();
p.settings.wrap = wrap;
- const text = try std.fmt.allocPrint(p.gpa, "{s}{s}", .{ prefix, "unrelated destination text\n" ** 80 });
+ const text = try std.fmt.allocPrint(p.gpa, "{s}{s}", .{ prefix, std.mem.asBytes(&@as([80][27]u8, @splat("unrelated destination text\n".*))) });
defer p.gpa.free(text);
const pane = try p.setTestFile(text);
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -1813,7 +1813,7 @@ test "a word the tag's wrapping breaks across rows is still one word to a click"
var pad: usize = 1;
const shown = while (pad < 80) : (pad += 1) {
p.gpa.free(pane.file.?.path);
- const path = try std.fmt.allocPrint(arena.allocator(), "/{s}/f.zig", .{("a" ** 80)[0..pad]});
+ const path = try std.fmt.allocPrint(arena.allocator(), "/{s}/f.zig", .{(&@as([80]u8, @splat('a')))[0..pad]});
pane.file.?.path = try p.gpa.dupe(u8, path);
p.sync();
const s = try pardes.tagline.shownTag(p, arena.allocator(), pane);
@@ -1866,7 +1866,7 @@ test "terminal output keeps following new rows after scrollback eviction" {
pane.body.mode = .tty;
pane.tty_filter = false;
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
var frame = std.heap.ArenaAllocator.init(gpa);
defer frame.deinit();
var evictions: usize = 0;
@@ -1885,7 +1885,7 @@ test "terminal output keeps following new rows after scrollback eviction" {
if (pages.scrollbar().total < previous) evictions += 1;
}
try std.testing.expect(evictions > phase);
- try std.testing.expect(pages.page_size <= pages.maxSize());
+ try std.testing.expect(pages.page_size <= pages.limits.max(.bytes));
const sb = pages.scrollbar();
try std.testing.expectEqual(sb.total - pane.rows, sb.offset);
const full = try panes.terminal.screenTextAlloc(pane, gpa);
@@ -1926,7 +1926,7 @@ test "terminal edit stays on its surviving row when old scrollback is evicted" {
const pane = p.panes[0].?;
pane.body.mode = .tty;
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
var next: usize = 0;
while (next < 3000) {
var buf: [32]u8 = undefined;
@@ -1977,9 +1977,9 @@ test "terminal edits and undo survive partial history clearing and whole-screen
pane.body.mode = .tty;
if (action == .reset_alternate)
p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b[?1049h" } });
- p.update(.{ .output = .{ .pane = 0, .bytes = "old row\r\n" ** 40 } });
+ p.update(.{ .output = .{ .pane = 0, .bytes = std.mem.asBytes(&@as([40][9]u8, @splat("old row\r\n".*))) } });
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
const row: i32 = @as(i32, @intCast(pages.total_rows - pane.rows)) +
@as(i32, if (action == .partial_clear_history) -1 else 2);
pane.body.mode = .normal;
@@ -2005,7 +2005,7 @@ test "terminal edits and undo survive partial history clearing and whole-screen
const bytes = switch (action) {
.clear_history, .partial_clear_history => "\x1b[3J",
.reset_primary, .reset_alternate => "\x1bc",
- .evict_all, .hidden_undo => "new row\r\n" ** 4000,
+ .evict_all, .hidden_undo => std.mem.asBytes(&@as([4000][9]u8, @splat("new row\r\n".*))),
};
p.update(.{ .output = .{ .pane = 0, .bytes = bytes } });
const expected: i32 = if (action == .clear_history) 2 else 0;
@@ -2045,7 +2045,7 @@ test "terminal lower scroll regions do not move edits above them" {
var setup: [64]u8 = undefined;
const bytes = try std.fmt.bufPrint(&setup, "\x1b[4;{d}r\x1b[{d};1H", .{ pane.rows, pane.rows });
p.update(.{ .output = .{ .pane = 0, .bytes = bytes } });
- p.update(.{ .output = .{ .pane = 0, .bytes = "tail\r\n" ** 50 } });
+ p.update(.{ .output = .{ .pane = 0, .bytes = std.mem.asBytes(&@as([50][6]u8, @splat("tail\r\n".*))) } });
try std.testing.expectEqual(total, panes.terminal.scrollbar(pane).total);
try std.testing.expectEqual(@as(i32, 1), pane.ovl.?.row);
try std.testing.expectEqual(@as(i32, 1), pane.body.cur_row);
@@ -2064,7 +2064,7 @@ test "terminal eviction and lower-region scrolling in one read preserve a surviv
const pane = p.panes[0].?;
pane.body.mode = .tty;
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
var next: usize = 0;
while (next < 3000) {
var buf: [32]u8 = undefined;
@@ -2229,7 +2229,7 @@ test "prompt cancellation restores the selection before regex previews" {
}
test "a prompt that cannot be opened leaves the open one as it was" {
- const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".params[3].type.?;
+ const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".param_types[3].?;
for ([_]Request{ .{ .search = config.search_marker }, .save, .{ .pipe = .replace }, .{ .pipe = .ignore }, .{ .pipe = .insert }, .{ .pipe = .append } }) |request| {
var failing = std.testing.FailingAllocator.init(std.testing.allocator, .{});
const p = try Pardes.init(failing.allocator(), .{ .tty_only = true });
@@ -2268,7 +2268,7 @@ test "Save's prompt starts from the pane's directory" {
}
test "a prompt opens with one allocation" {
- const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".params[3].type.?;
+ const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".param_types[3].?;
for ([_]Request{ .{ .search = config.search_marker }, .save, .{ .pipe = .replace }, .{ .pipe = .ignore }, .{ .pipe = .insert }, .{ .pipe = .append } }) |request| {
var failing = std.testing.FailingAllocator.init(std.testing.allocator, .{});
const p = try Pardes.init(failing.allocator(), .{ .tty_only = true });
@@ -3441,7 +3441,7 @@ const PdfTests = struct {
defer probe.deinit(std.testing.allocator);
try std.testing.expectEqual(@as(usize, 0), probe.page);
try std.testing.expect(probe.quads.len > 0);
- try std.testing.expect(std.ascii.indexOfIgnoreCase(probe.text, "Pardes") != null);
+ try std.testing.expect(std.ascii.findIgnoreCase(probe.text, "Pardes") != null);
}
test "PDF point mapping restores band origin and fractional placement" {
@@ -4812,7 +4812,7 @@ test "growing a file pane colors every newly visible Zig keyword" {
const gpa = std.testing.allocator;
const p = try Pardes.init(gpa, .{ .tty_only = true, .cols = 80, .rows = 8 });
defer p.deinit();
- const pane = try p.setTestFile("pub fn f() void { if (true) {} }\n" ** 100);
+ const pane = try p.setTestFile(std.mem.asBytes(&@as([100][33]u8, @splat("pub fn f() void { if (true) {} }\n".*))));
const file = &pane.file.?;
gpa.free(file.path);
file.path = try gpa.dupe(u8, "/resize.zig");
diff --git a/test/pdf.zig b/test/pdf.zig
index a0eb8154..a51fd1a9 100644
--- a/test/pdf.zig
+++ b/test/pdf.zig
@@ -2080,14 +2080,14 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
@as(i32, r.y + r.h - 1),
));
if (!panes.Pdf.beginSelection(p, pane, col, row)) continue;
- if (std.ascii.indexOfIgnoreCase(pv.selection_text, "Pardes") != null) {
+ if (std.ascii.findIgnoreCase(pv.selection_text, "Pardes") != null) {
selected_col = col;
selected_row = row;
break :find_word;
}
};
const word_col = selected_col orelse return error.PdfMouseMappingMissedWord;
- try std.testing.expect(std.ascii.indexOfIgnoreCase(
+ try std.testing.expect(std.ascii.findIgnoreCase(
pardes.test_api.heldSelection(p, 0).?,
"Pardes",
) != null);
@@ -2142,7 +2142,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
const hover = p.pdf_hover_preview orelse return error.MissingPdfHoverPreview;
try std.testing.expectEqual(@as(usize, 0), hover.probe.page);
try std.testing.expect(hover.probe.quads.len > 0);
- try std.testing.expect(std.ascii.indexOfIgnoreCase(hover.probe.text, "Pardes") != null);
+ try std.testing.expect(std.ascii.findIgnoreCase(hover.probe.text, "Pardes") != null);
try std.testing.expect(p.look_hover_preview == null);
try std.testing.expect(p.look_hover_wait == null);
@@ -2188,7 +2188,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
// search highlights without carrying an old selection into the result.
p.update(.{ .mouse = .{ .button = config.look_button, .kind = .press, .col = word_col, .row = selected_row } });
p.update(.{ .mouse = .{ .button = config.look_button, .kind = .release, .col = word_col, .row = selected_row } });
- try std.testing.expect(std.ascii.indexOfIgnoreCase(pv.search_query, "Pardes") != null);
+ try std.testing.expect(std.ascii.findIgnoreCase(pv.search_query, "Pardes") != null);
pv.resolveSearch(p.pdf_gpa);
const highlights = (try panes.Pdf.buildHighlights(
pv,
diff --git a/test/pdf_scroll_bench.zig b/test/pdf_scroll_bench.zig
index 166fa809..fdc42660 100644
--- a/test/pdf_scroll_bench.zig
+++ b/test/pdf_scroll_bench.zig
@@ -597,7 +597,7 @@ fn reportText(config: Config, travel: Travel, results: []const Result) void {
"total_us", "rasters", "kept", "peak_kib",
"visual", "transport",
});
- std.debug.print("{s}\n", .{"-" ** 160});
+ std.debug.print("{s}\n", .{&@as([160]u8, @splat('-'))});
for (results) |result| std.debug.print(
"{s:<16} {d:>6} {d:>7} {d:>10} {d:>10} {d:>10} {d:>10} {d:>10} {d:>11} {d:>7} {d:>5} {d:>9} {x:0>16} {x:0>16}\n",
.{
diff --git a/test/pdf_sections_bench.zig b/test/pdf_sections_bench.zig
index 92c9ef7c..ee26e83d 100644
--- a/test/pdf_sections_bench.zig
+++ b/test/pdf_sections_bench.zig
@@ -454,7 +454,7 @@ fn reportText(config: Config, results: []const Result) void {
std.debug.print("{s:<42} {s:>10} {s:>10} {s:>10} {s:>10} {s:>8} {s:>8} {s}\n", .{
"scenario", "min", "median", "p90", "max", "items", "bytes", "checksum",
});
- std.debug.print("{s}\n", .{"-" ** 124});
+ std.debug.print("{s}\n", .{&@as([124]u8, @splat('-'))});
for (results) |result| std.debug.print(
"{s:<42} {d:>10} {d:>10} {d:>10} {d:>10} {d:>8} {d:>8} {x:0>16}\n",
.{
diff --git a/test/perf-baseline-gui-Debug.json b/test/perf-baseline-gui-Debug.json
deleted file mode 100644
index 39f5913c..00000000
--- a/test/perf-baseline-gui-Debug.json
+++ /dev/null
@@ -1 +0,0 @@
-{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"Debug","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseSafe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1818,"med_us":2104,"p90_us":2287,"max_us":2293},{"op":"render","fixture":"medium","min_us":78,"med_us":82,"p90_us":87,"max_us":87},{"op":"key-down","fixture":"medium","min_us":79,"med_us":81,"p90_us":89,"max_us":109},{"op":"key-right","fixture":"medium","min_us":79,"med_us":84,"p90_us":85,"max_us":89},{"op":"page-down","fixture":"medium","min_us":79,"med_us":81,"p90_us":84,"max_us":87},{"op":"wheel","fixture":"medium","min_us":77,"med_us":78,"p90_us":82,"max_us":82},{"op":"edit-char","fixture":"medium","min_us":1019,"med_us":1349,"p90_us":1597,"max_us":1632},{"op":"edit-twin","fixture":"medium","min_us":2029,"med_us":2353,"p90_us":2455,"max_us":2676},{"op":"body-2m","fixture":"medium","min_us":5978,"med_us":9708,"p90_us":11361,"max_us":11666},{"op":"body-appends","fixture":"medium","min_us":117933,"med_us":211247,"p90_us":268014,"max_us":275006},{"op":"deep-sel","fixture":"medium","min_us":73,"med_us":75,"p90_us":80,"max_us":84}]}
diff --git a/test/perf-baseline-gui-debug.json b/test/perf-baseline-gui-debug.json
new file mode 100644
index 00000000..4b60520b
--- /dev/null
+++ b/test/perf-baseline-gui-debug.json
@@ -0,0 +1 @@
+{"harness":"6cf9f4b8943e7e29","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1732,"med_us":1881,"p90_us":2035,"max_us":2072},{"op":"render","fixture":"medium","min_us":89,"med_us":92,"p90_us":101,"max_us":102},{"op":"key-down","fixture":"medium","min_us":92,"med_us":94,"p90_us":100,"max_us":100},{"op":"key-right","fixture":"medium","min_us":91,"med_us":93,"p90_us":105,"max_us":109},{"op":"page-down","fixture":"medium","min_us":91,"med_us":95,"p90_us":99,"max_us":106},{"op":"wheel","fixture":"medium","min_us":90,"med_us":95,"p90_us":101,"max_us":101},{"op":"edit-char","fixture":"medium","min_us":1226,"med_us":1678,"p90_us":2093,"max_us":2323},{"op":"edit-twin","fixture":"medium","min_us":2275,"med_us":2697,"p90_us":2868,"max_us":2920},{"op":"body-2m","fixture":"medium","min_us":5213,"med_us":11333,"p90_us":18974,"max_us":18999},{"op":"body-appends","fixture":"medium","min_us":175012,"med_us":260087,"p90_us":317184,"max_us":317469},{"op":"deep-sel","fixture":"medium","min_us":83,"med_us":85,"p90_us":86,"max_us":98}]}
diff --git a/test/perf-baseline-tty-Debug.json b/test/perf-baseline-tty-Debug.json
deleted file mode 100644
index 9110398c..00000000
--- a/test/perf-baseline-tty-Debug.json
+++ /dev/null
@@ -1 +0,0 @@
-{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"Debug","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseSafe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1881,"med_us":2148,"p90_us":2324,"max_us":2644},{"op":"render","fixture":"medium","min_us":79,"med_us":87,"p90_us":90,"max_us":93},{"op":"key-down","fixture":"medium","min_us":81,"med_us":84,"p90_us":86,"max_us":90},{"op":"key-right","fixture":"medium","min_us":80,"med_us":85,"p90_us":89,"max_us":102},{"op":"page-down","fixture":"medium","min_us":85,"med_us":86,"p90_us":88,"max_us":88},{"op":"wheel","fixture":"medium","min_us":79,"med_us":85,"p90_us":90,"max_us":91},{"op":"edit-char","fixture":"medium","min_us":1037,"med_us":1300,"p90_us":1639,"max_us":1647},{"op":"edit-twin","fixture":"medium","min_us":2046,"med_us":2378,"p90_us":2529,"max_us":2585},{"op":"body-2m","fixture":"medium","min_us":5790,"med_us":9510,"p90_us":12226,"max_us":12462},{"op":"body-appends","fixture":"medium","min_us":132421,"med_us":224849,"p90_us":257368,"max_us":274890},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":80,"p90_us":84,"max_us":86}]}
diff --git a/test/perf-baseline-tty-ReleaseFast.json b/test/perf-baseline-tty-ReleaseFast.json
deleted file mode 100644
index 4cbc8b95..00000000
--- a/test/perf-baseline-tty-ReleaseFast.json
+++ /dev/null
@@ -1 +0,0 @@
-{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"ReleaseFast","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseFast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1775,"med_us":1995,"p90_us":2092,"max_us":2094},{"op":"render","fixture":"medium","min_us":80,"med_us":86,"p90_us":89,"max_us":95},{"op":"key-down","fixture":"medium","min_us":81,"med_us":83,"p90_us":95,"max_us":101},{"op":"key-right","fixture":"medium","min_us":79,"med_us":84,"p90_us":85,"max_us":98},{"op":"page-down","fixture":"medium","min_us":80,"med_us":82,"p90_us":96,"max_us":97},{"op":"wheel","fixture":"medium","min_us":78,"med_us":80,"p90_us":87,"max_us":88},{"op":"edit-char","fixture":"medium","min_us":1036,"med_us":1377,"p90_us":1602,"max_us":1621},{"op":"edit-twin","fixture":"medium","min_us":2266,"med_us":2715,"p90_us":3695,"max_us":3927},{"op":"body-2m","fixture":"medium","min_us":4739,"med_us":8675,"p90_us":11518,"max_us":13657},{"op":"body-appends","fixture":"medium","min_us":111613,"med_us":214959,"p90_us":264859,"max_us":283506},{"op":"deep-sel","fixture":"medium","min_us":74,"med_us":76,"p90_us":89,"max_us":96}]}
diff --git a/test/perf-baseline-tty-debug.json b/test/perf-baseline-tty-debug.json
new file mode 100644
index 00000000..a01335bd
--- /dev/null
+++ b/test/perf-baseline-tty-debug.json
@@ -0,0 +1 @@
+{"harness":"6cf9f4b8943e7e29","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":2169,"med_us":2697,"p90_us":3126,"max_us":3207},{"op":"render","fixture":"medium","min_us":89,"med_us":96,"p90_us":101,"max_us":115},{"op":"key-down","fixture":"medium","min_us":93,"med_us":98,"p90_us":104,"max_us":115},{"op":"key-right","fixture":"medium","min_us":96,"med_us":97,"p90_us":102,"max_us":108},{"op":"page-down","fixture":"medium","min_us":96,"med_us":98,"p90_us":102,"max_us":103},{"op":"wheel","fixture":"medium","min_us":89,"med_us":100,"p90_us":128,"max_us":168},{"op":"edit-char","fixture":"medium","min_us":1821,"med_us":2274,"p90_us":2404,"max_us":2610},{"op":"edit-twin","fixture":"medium","min_us":2710,"med_us":3180,"p90_us":3413,"max_us":3636},{"op":"body-2m","fixture":"medium","min_us":9090,"med_us":14438,"p90_us":18158,"max_us":22063},{"op":"body-appends","fixture":"medium","min_us":241367,"med_us":375874,"p90_us":470623,"max_us":528094},{"op":"deep-sel","fixture":"medium","min_us":88,"med_us":89,"p90_us":90,"max_us":90}]}
diff --git a/test/perf-baseline-tty-fast.json b/test/perf-baseline-tty-fast.json
new file mode 100644
index 00000000..04fc88d3
--- /dev/null
+++ b/test/perf-baseline-tty-fast.json
@@ -0,0 +1 @@
+{"harness":"6cf9f4b8943e7e29","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1695,"med_us":2024,"p90_us":2180,"max_us":2292},{"op":"render","fixture":"medium","min_us":79,"med_us":82,"p90_us":92,"max_us":94},{"op":"key-down","fixture":"medium","min_us":81,"med_us":82,"p90_us":83,"max_us":84},{"op":"key-right","fixture":"medium","min_us":80,"med_us":82,"p90_us":91,"max_us":91},{"op":"page-down","fixture":"medium","min_us":81,"med_us":84,"p90_us":90,"max_us":171},{"op":"wheel","fixture":"medium","min_us":79,"med_us":80,"p90_us":90,"max_us":101},{"op":"edit-char","fixture":"medium","min_us":1332,"med_us":1691,"p90_us":1967,"max_us":1987},{"op":"edit-twin","fixture":"medium","min_us":2160,"med_us":2457,"p90_us":2718,"max_us":2757},{"op":"body-2m","fixture":"medium","min_us":5047,"med_us":13525,"p90_us":16257,"max_us":20323},{"op":"body-appends","fixture":"medium","min_us":155834,"med_us":261597,"p90_us":329936,"max_us":333538},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":76,"p90_us":84,"max_us":96}]}
diff --git a/test/perf.zig b/test/perf.zig
index c9235954..d01d1bb5 100644
--- a/test/perf.zig
+++ b/test/perf.zig
@@ -1054,7 +1054,7 @@ fn measureTerminalSession(io: std.Io, mib: usize, reps: usize, json: bool) !void
.undo_output = undo_output,
.history_rows = state.vt.screens.active.pages.scrollbar().total,
.history_bytes = state.vt.screens.active.pages.page_size,
- .history_limit_bytes = state.vt.screens.active.pages.maxSize(),
+ .history_limit_bytes = state.vt.screens.active.pages.limits.max(.bytes),
.row_count_decreases = row_count_decreases,
.allocator_calls = counter.calls,
.allocator_live_after_output = live_after_output,
@@ -1385,7 +1385,7 @@ fn reportText(
for (fixtures) |fx| {
if (base != null) o(" {s:>19}", .{fx.name}) else o(" {s:>12}", .{fx.name});
}
- o("\n{s}\n", .{if (base != null) "-" ** (12 + fixtures.len * 20) else "-" ** (12 + fixtures.len * 13)});
+ o("\n{s}\n", .{if (base != null) &@as([12 + fixtures.len * 20]u8, @splat('-')) else &@as([12 + fixtures.len * 13]u8, @splat('-'))});
var worst_jitter: f64 = 0;
for (std.enums.values(Op), 0..) |op, oi| {
o("{s:<12}", .{op.label()});
@@ -1412,7 +1412,7 @@ fn reportText(
for (term_fixtures) |fx| {
if (base != null) o(" {s:>19}", .{fx.name}) else o(" {s:>12}", .{fx.name});
}
- o("\n{s}\n", .{if (base != null) "-" ** (12 + term_fixtures.len * 20) else "-" ** (12 + term_fixtures.len * 13)});
+ o("\n{s}\n", .{if (base != null) &@as([12 + term_fixtures.len * 20]u8, @splat('-')) else &@as([12 + term_fixtures.len * 13]u8, @splat('-'))});
for (std.enums.values(TermOp), 0..) |op, oi| {
o("{s:<12}", .{op.label()});
for (0..term_fixtures.len) |fi| {
@@ -1524,10 +1524,11 @@ fn parseBase(src: []const u8, opts: Options, bytes: *const [fixtures.len]usize)
defer parsed.deinit();
const report = parsed.value;
if (!std.mem.eql(u8, report.harness, harness_id)) return error.BaselineHarnessMismatch;
- inline for (std.meta.fields(BuildIdentity)) |field| {
- const before = @field(report.build, field.name);
- const after = @field(build_identity, field.name);
- const same = if (field.type == []const u8) std.mem.eql(u8, before, after) else before == after;
+ const info = @typeInfo(BuildIdentity).@"struct";
+ inline for (info.field_names, info.field_types) |name, T| {
+ const before = @field(report.build, name);
+ const after = @field(build_identity, name);
+ const same = if (T == []const u8) std.mem.eql(u8, before, after) else before == after;
if (!same) return error.BaselineBuildMismatch;
}
if (report.cols != opts.cols or report.rows != opts.rows or report.reps != opts.reps or
diff --git a/test/snapshot.zig b/test/snapshot.zig
index 5522fbb9..2d8a8664 100644
--- a/test/snapshot.zig
+++ b/test/snapshot.zig
@@ -157,8 +157,8 @@ pub fn main(init: std.process.Init) !void {
script_i += 1;
}
if (exe == null) fatal("usage: pardes-snap <exe> [scripts...] [--update] [--jobs=N]", .{});
- const exe_z = try arena.dupeZ(u8, exe.?);
- lspmock_bin = if (lspmock) |p| try arena.dupeZ(u8, p) else null;
+ const exe_z = try arena.dupeSentinel(u8, exe.?, 0);
+ lspmock_bin = if (lspmock) |p| try arena.dupeSentinel(u8, p, 0) else null;
if (scripts.len == 0) {
scripts = try listSnaps(arena, try absPath(arena, orig_cwd, "test/snapshots"));
@@ -443,7 +443,7 @@ fn runBatch(
fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8, update: bool) u8 {
if (careful) beCareful();
const stem = std.fs.path.stem(script_path);
- const report_z = arena.dupeZ(u8, reportPath(arena, script_path) catch return 1) catch return 1;
+ const report_z = arena.dupeSentinel(u8, reportPath(arena, script_path) catch return 1, 0) catch return 1;
const fd = libc.open(report_z, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644));
if (fd >= 0) {
_ = libc.dup2(fd, 1);
@@ -457,7 +457,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8
// dirty to every manual `cmp` audit. Unlink only this script's exact path
// before it starts; a new mismatch below writes it back.
const actual_path = std.fmt.allocPrint(arena, "{s}.actual", .{base_path}) catch return 1;
- const actual_path_z = arena.dupeZ(u8, actual_path) catch return 1;
+ const actual_path_z = arena.dupeSentinel(u8, actual_path, 0) catch return 1;
if (record_dir == null) _ = libc.unlink(actual_path_z);
const golden: ?[]u8 = if (record_dir == null) readFileAlloc(arena, golden_path) catch null else null;
const started = eh.nowMs();
@@ -473,7 +473,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8
return 0;
}
if (update) {
- eh.writeFile(arena.dupeZ(u8, golden_path) catch return 1, out) catch return 1;
+ eh.writeFile(arena.dupeSentinel(u8, golden_path, 0) catch return 1, out) catch return 1;
std.debug.print("UPDATED {s} ({d} bytes)\n", .{ stem, out.len });
return 0;
}
@@ -485,7 +485,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8
std.debug.print("PASS {s} ({d}ms)\n", .{ stem, took });
return 0;
}
- eh.writeFile(arena.dupeZ(u8, actual_path) catch return 1, out) catch |err| {
+ eh.writeFile(arena.dupeSentinel(u8, actual_path, 0) catch return 1, out) catch |err| {
std.debug.print("FAIL {s}: differs from golden; cannot write {s}: {s} ({d}ms)\n", .{ stem, actual_path, @errorName(err), took });
printFirstDiff(golden.?, out);
return 1;
@@ -557,7 +557,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
try mkdir(arena, work, false);
// deterministic shell: fixed prompt, no history, no user rc leakage
try eh.writeFile(try std.fmt.allocPrintSentinel(arena, "{s}/.bashrc", .{home}, 0), "PS1='$ '\nHISTFILE=\n");
- _ = setenv("HOME", try arena.dupeZ(u8, home), 1);
+ _ = setenv("HOME", try arena.dupeSentinel(u8, home, 0), 1);
// Keep startup configuration hermetic even when the developer exports an
// XDG directory that points outside this per-snapshot fake home.
const config_home = try std.fmt.allocPrintSentinel(arena, "{s}/.config", .{home}, 0);
@@ -602,8 +602,8 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// take turns — which cost more wall clock than the other 51 scripts put
// together. Scripts name it `$DUMP`.
const dump_path = try std.fmt.allocPrint(arena, "{s}/dump.zon", .{base});
- _ = setenv("PARDES_DUMP", try arena.dupeZ(u8, dump_path), 1);
- if (chdirRc(try arena.dupeZ(u8, work)) < 0) return error.ChdirFailed;
+ _ = setenv("PARDES_DUMP", try arena.dupeSentinel(u8, dump_path, 0), 1);
+ if (chdirRc(try arena.dupeSentinel(u8, work, 0)) < 0) return error.ChdirFailed;
const chunks = try arena.alloc([]const u8, countCaptures(src));
var chunk_len: usize = 0;
@@ -636,7 +636,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
try eh.appendFile(try std.fmt.allocPrintSentinel(arena, "{s}/pardes/init", .{config_home}, 0), setting);
} else if (std.mem.eql(u8, cmd, "file")) {
const name = tok.next() orelse return error.BadScript;
- try eh.writeFile(try arena.dupeZ(u8, name), try unescape(arena, tok.rest()));
+ try eh.writeFile(try arena.dupeSentinel(u8, name, 0), try unescape(arena, tok.rest()));
} else if (std.mem.eql(u8, cmd, "lines")) {
const name = tok.next() orelse return error.BadScript;
const n = try std.fmt.parseInt(usize, tok.next() orelse return error.BadScript, 10);
@@ -646,7 +646,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// scroll test needs and `file` can only give as one huge script line
const tail = tok.rest();
const buf = try numberedLines(arena, n, tail);
- try eh.writeFile(try arena.dupeZ(u8, name), buf);
+ try eh.writeFile(try arena.dupeSentinel(u8, name, 0), buf);
} else if (std.mem.eql(u8, cmd, "ppmdiag")) {
// The diagonal-split test PPM from the old e2e (white over blue),
// grown to 512x512 with the white half filled by a fixed LCG
@@ -658,7 +658,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// down to flat color and a block always wins).
const name = tok.next() orelse return error.BadScript;
const ppm = try ppmDiag(arena);
- try eh.writeFile(try arena.dupeZ(u8, name), ppm);
+ try eh.writeFile(try arena.dupeSentinel(u8, name, 0), ppm);
} else if (std.mem.eql(u8, cmd, "dirmk")) {
try mkdir(arena, tok.next() orelse return error.BadScript, false);
} else if (std.mem.eql(u8, cmd, "run")) {
@@ -668,7 +668,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// different inotify event. This runs in the script's cwd, as a
// child of the RUNNER, so nothing it does reaches the app's ptys:
// whatever the app then shows, it woke up for by itself.
- if (system(try arena.dupeZ(u8, tok.rest())) != 0) return error.RunFailed;
+ if (system(try arena.dupeSentinel(u8, tok.rest(), 0)) != 0) return error.RunFailed;
} else if (std.mem.eql(u8, cmd, "start")) {
const rows = try std.fmt.parseInt(u16, tok.next() orelse return error.BadScript, 10);
const cols = try std.fmt.parseInt(u16, tok.next() orelse return error.BadScript, 10);
@@ -676,7 +676,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
var nextra: usize = 0;
while (tok.next()) |a| : (nextra += 1) {
if (nextra >= extra.len) return error.BadScript;
- extra[nextra] = (try arena.dupeZ(u8, a)).ptr;
+ extra[nextra] = (try arena.dupeSentinel(u8, a, 0)).ptr;
}
if (h) |*hp| hp.deinit(); // scripts may restart (e.g. dump then -l)
// a new process is a new screen: capture it whole, or its first
@@ -963,13 +963,13 @@ fn treeAsleep(root: libc.pid_t) bool {
while (n > 0) {
n -= 1;
const pid = stack[n];
- const dir_path = std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task", .{pid}) catch continue;
+ const dir_path = std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task", .{pid}, 0) catch continue;
const dir = libc.opendir(dir_path) orelse continue; // exited between steps
defer _ = libc.closedir(dir);
while (libc.readdir(dir)) |d| {
const tid = std.mem.sliceTo(@as([*:0]const u8, @ptrCast(&d.name)), 0);
if (tid[0] == '.') continue;
- const stat = readProc(&buf, std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task/{s}/stat", .{ pid, tid }) catch continue) orelse continue;
+ const stat = readProc(&buf, std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task/{s}/stat", .{ pid, tid }, 0) catch continue) orelse continue;
// "pid (comm) S ..." — comm can hold spaces and parens, so the
// state is the char two past the LAST ')'
const close = std.mem.lastIndexOfScalar(u8, stat, ')') orelse continue;
@@ -983,7 +983,7 @@ fn treeAsleep(root: libc.pid_t) bool {
'R', 'D', 'Z' => return false,
else => {},
}
- const kids = readProc(&buf, std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task/{s}/children", .{ pid, tid }) catch continue) orelse continue;
+ const kids = readProc(&buf, std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task/{s}/children", .{ pid, tid }, 0) catch continue) orelse continue;
var it = std.mem.tokenizeAny(u8, kids, " \n");
while (it.next()) |k| {
if (n >= stack.len) return false; // deeper than we can walk: assume busy
@@ -1554,7 +1554,7 @@ fn absPath(arena: std.mem.Allocator, cwd: []const u8, p: []const u8) ![]const u8
}
fn listSnaps(arena: std.mem.Allocator, dir_path: []const u8) ![][]const u8 {
- const dir_z = try arena.dupeZ(u8, dir_path);
+ const dir_z = try arena.dupeSentinel(u8, dir_path, 0);
const count = countSnapEntries(dir_z, dir_path);
const scripts = try arena.alloc([]const u8, count);
const dir = libc.opendir(dir_z) orelse fatal("no snapshots/ dir at {s}", .{dir_path});
@@ -1583,7 +1583,7 @@ fn countSnapEntries(dir_z: [:0]const u8, dir_path: []const u8) usize {
}
fn readFileAlloc(arena: std.mem.Allocator, path: []const u8) ![]u8 {
- const path_z = try arena.dupeZ(u8, path);
+ const path_z = try arena.dupeSentinel(u8, path, 0);
const fd = libc.open(path_z, .{ .ACCMODE = .RDONLY });
if (fd < 0) return error.OpenFailed;
defer _ = libc.close(fd);
@@ -1611,7 +1611,7 @@ fn readFileAlloc(arena: std.mem.Allocator, path: []const u8) ![]u8 {
}
fn mkdir(arena: std.mem.Allocator, path: []const u8, exist_ok: bool) !void {
- const path_z = try arena.dupeZ(u8, path);
+ const path_z = try arena.dupeSentinel(u8, path, 0);
const rc = libc.mkdir(path_z, 0o755);
if (rc != 0) {
if (exist_ok and libc.errno(rc) == .EXIST) return;
diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden
index df49336c..30473c9e 100644
--- a/test/snapshots/exec.golden
+++ b/test/snapshots/exec.golden
@@ -22,15 +22,17 @@
== snap kept grid=140x31 cursor=6,3
|3: ZZARG ls
|4: ./c.sh e.txt
+|8:
|9:
== snap chord grid=140x31 cursor=6,3
|3: ZZARG Exec ls
-|9: CHORDARG:ZZARG
+|5: ./c.sh ZZARG
+|6: CHORDARG:ZZARG
== snap deleted grid=140x31 cursor=4,5
|3: ls ls
|4: e.txt e.txt
-|8:
-|9:
+|5:
+|6:
|17:
|18:
|19:
diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden
deleted file mode 100644
index 787a9d8f..00000000
--- a/test/snapshots/tinywin.golden
+++ /dev/null
@@ -1,83 +0,0 @@
-== snap stacked grid=100x31 cursor=14,3
-| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Collapse Del
-| $ :^[n^[n^[n
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del
-| 1
-== snap shrunk grid=60x4 cursor=59,3
-| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Col
-| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del
-== snap columns grid=100x31 cursor=23,3
-| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Collapse Del
-| $ :^[n^[n^[n cn cn cn
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del
-| 1
-== snap narrow grid=4x31 cursor=2,20
-| Ne
-| Ne
-|$ /t
-| mp
-| /p
-| ar
-| de
-| s-
-| sn
-| ap
-| $
-| ^[
-| n^
-| [n
-| ^[
-| n
-| cn
-| c
-| n
-| cn
-|
-| /t
-| mp
-| /p
-| ar
-| de
-| s-
-| sn
-| ap
diff --git a/test/snapshots/tinywin.snap b/test/snapshots/tinywin.snap
deleted file mode 100644
index 3d22d583..00000000
--- a/test/snapshots/tinywin.snap
+++ /dev/null
@@ -1,31 +0,0 @@
-# Shrinking the window past "one row per pane" used to panic: computeGeom gave
-# every pane in a column at least one row, so `y` walked off the bottom and
-# renderPane got a rect outside the surface (assert). Panes that no longer fit
-# now get h = 0 and simply do not render until the window grows back.
-start 31 100
-wait 8000 $
-key a-n
-stable 400 8000
-key a-n
-stable 400 8000
-key a-n
-stable 400 8000
-key a-n
-stable 700 15000
-snap stacked
-resize 4 60
-stable 700 10000
-snap shrunk
-# ...and the same sideways: more columns than the window is wide
-resize 31 100
-stable 700 10000
-key space c n
-stable 600 8000
-key space c n
-stable 600 8000
-key space c n
-stable 700 15000
-snap columns
-resize 31 4
-stable 700 10000
-snap narrow
diff --git a/test/unit_profile_test.zig b/test/unit_profile_test.zig
index 721f1212..a4cdd09e 100644
--- a/test/unit_profile_test.zig
+++ b/test/unit_profile_test.zig
@@ -149,11 +149,8 @@ fn fixture(init: std.process.Init) !void {
var write_buffer: [1024]u8 = undefined;
var reader = std.Io.File.stdin().readerStreaming(io, &read_buffer);
var writer = std.Io.File.stdout().writerStreaming(io, &write_buffer);
- var server = try std.zig.Server.init(.{
- .in = &reader.interface,
- .out = &writer.interface,
- .zig_version = if (std.mem.eql(u8, mode, "version")) "wrong-version" else builtin.zig_version_string,
- });
+ var server: std.zig.Server = .{ .in = &reader.interface, .out = &writer.interface };
+ try server.serveStringMessage(.zig_version, if (std.mem.eql(u8, mode, "version")) "wrong-version" else builtin.zig_version_string);
while (true) {
const request = try server.receiveMessage();
switch (request.tag) {