authorgravatar for 3041675+imomaliev@users.noreply.github.comSardorbek Imomaliev <3041675+imomaliev@users.noreply.github.com> 2025-09-11 17:43:11+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-09-11 16:43:11+00:00
log6b8cef81076dd4577d7b053b555432ea1805d5e5
tree9d4c2936e820b29419b19f9c2b471fb7d13be1b6
parentfb3afc8d3da547c1b73c9cf18cd1a394b0ebefbc
signaturebadge-check Signed by PGP key B5690EEEBB952194

Fix standalone test simple/cat/main.zig after Writergate update (#25188)

* Make cat in test/standalone/simple working again - Fixes: zig/0.15.1/lib/zig/std/Io/Writer.zig:939:11: 0x1049aef63 in sendFileAll (nclip) assert(w.buffer.len > 0); - because we are no using non zero buffers for stdout - "do not forget to flush" * replace std.fs with fs because we are already importing it

1 files changed, 6 insertions(+), 2 deletions(-)

test/standalone/simple/cat/main.zig+6-2
...@@ -13,9 +13,10 @@ pub fn main() !void {...@@ -13,9 +13,10 @@ pub fn main() !void {
1313
14 const exe = args[0];14 const exe = args[0];
15 var catted_anything = false;15 var catted_anything = false;
16 var stdout_writer = std.fs.File.stdout().writerStreaming(&.{});16 var stdout_buffer: [4096]u8 = undefined;
17 var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);
17 const stdout = &stdout_writer.interface;18 const stdout = &stdout_writer.interface;
18 var stdin_reader = std.fs.File.stdin().readerStreaming(&.{});19 var stdin_reader = fs.File.stdin().readerStreaming(&.{});
1920
20 const cwd = fs.cwd();21 const cwd = fs.cwd();
2122
...@@ -23,6 +24,7 @@ pub fn main() !void {...@@ -23,6 +24,7 @@ pub fn main() !void {
23 if (mem.eql(u8, arg, "-")) {24 if (mem.eql(u8, arg, "-")) {
24 catted_anything = true;25 catted_anything = true;
25 _ = try stdout.sendFileAll(&stdin_reader, .unlimited);26 _ = try stdout.sendFileAll(&stdin_reader, .unlimited);
27 try stdout.flush();
26 } else if (mem.startsWith(u8, arg, "-")) {28 } else if (mem.startsWith(u8, arg, "-")) {
27 return usage(exe);29 return usage(exe);
28 } else {30 } else {
...@@ -32,10 +34,12 @@ pub fn main() !void {...@@ -32,10 +34,12 @@ pub fn main() !void {
32 catted_anything = true;34 catted_anything = true;
33 var file_reader = file.reader(&.{});35 var file_reader = file.reader(&.{});
34 _ = try stdout.sendFileAll(&file_reader, .unlimited);36 _ = try stdout.sendFileAll(&file_reader, .unlimited);
37 try stdout.flush();
35 }38 }
36 }39 }
37 if (!catted_anything) {40 if (!catted_anything) {
38 _ = try stdout.sendFileAll(&stdin_reader, .unlimited);41 _ = try stdout.sendFileAll(&stdin_reader, .unlimited);
42 try stdout.flush();
39 }43 }
40}44}
4145