From 877d56c43b982f99130604b8a61400bbb04b7c18 Mon Sep 17 00:00:00 2001 From: mlugg Date: Tue, 1 Oct 2024 06:02:54 +0100 Subject: [PATCH] Revert "debug time :cool_sunglasses:" This reverts commit e4ec8ef32ff1b644407e4318bc7b2dc52b7d5b63. --- test/tests.zig | 3 +-- tools/incr-check.zig | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/test/tests.zig b/test/tests.zig index 9da19ad442..242f294b4e 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -1484,8 +1484,7 @@ pub fn addIncrementalTests(b: *std.Build, test_step: *Step) !void { run.addFileArg(b.path("test/incremental/").path(b, entry.path)); run.addArgs(&.{ "--zig-lib-dir", b.fmt("{}", .{b.graph.zig_lib_directory}) }); - //run.addCheck(.{ .expect_term = .{ .Exited = 0 } }); - run.stdio = .inherit; + run.addCheck(.{ .expect_term = .{ .Exited = 0 } }); test_step.dependOn(&run.step); } diff --git a/tools/incr-check.zig b/tools/incr-check.zig index fb34dd8525..b5329f134e 100644 --- a/tools/incr-check.zig +++ b/tools/incr-check.zig @@ -95,7 +95,7 @@ pub fn main() !void { }; defer target_prog_node.end(); - if (debug_log_verbose or true) { + if (debug_log_verbose) { std.log.scoped(.status).info("target: '{s}-{s}'", .{ target.query, @tagName(target.backend) }); } @@ -183,7 +183,7 @@ pub fn main() !void { var update_node = target_prog_node.start(update.name, 0); defer update_node.end(); - if (debug_log_verbose or true) { + if (debug_log_verbose) { std.log.scoped(.status).info("update: '{s}'", .{update.name}); } @@ -196,8 +196,6 @@ pub fn main() !void { waitChild(&child, &eval); } - - std.time.sleep(10 * std.time.ns_per_ms); } const Eval = struct { @@ -403,7 +401,6 @@ const Eval = struct { const run_prog_node = prog_node.start("run generated executable", 0); defer run_prog_node.end(); - std.log.scoped(.status).info("run executable", .{}); const result = std.process.Child.run(.{ .allocator = eval.arena, @@ -457,7 +454,6 @@ const Eval = struct { } if (!is_foreign and result.stderr.len != 0) std.process.exit(1); - std.log.scoped(.status).info("executable run completed", .{}); } fn requestUpdate(eval: *Eval) !void { @@ -496,8 +492,6 @@ const Eval = struct { fn buildCOutput(eval: *Eval, update: Case.Update, c_path: []const u8, out_path: []const u8, prog_node: std.Progress.Node) !void { std.debug.assert(eval.cc_child_args.items.len > 0); - std.log.scoped(.status).info("building cbe output", .{}); - const child_prog_node = prog_node.start("build cbe output", 0); defer child_prog_node.end();