Merge branch 'master' into autodoc-searchkey

1 files changed, 13 insertions, 8 deletions

diff --git a/lib/test_runner.zig b/lib/test_runner.zig
index 20d7b02e26..33fe547b57 100644
--- a/lib/test_runner.zig
+++ b/lib/test_runner.zig
@@ -12,10 +12,7 @@ var cmdline_buffer: [4096]u8 = undefined;
 var fba = std.heap.FixedBufferAllocator.init(&cmdline_buffer);
 
 pub fn main() void {
-    if (builtin.zig_backend == .stage2_wasm or
-        (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag != .linux) or
-        builtin.zig_backend == .stage2_aarch64)
-    {
+    if (builtin.zig_backend == .stage2_aarch64) {
         return mainSimple() catch @panic("test failure");
     }
 
@@ -234,25 +231,33 @@ pub fn log(
 /// work-in-progress backends can handle it.
 pub fn mainSimple() anyerror!void {
     const enable_print = false;
+    const print_all = false;
 
     var passed: u64 = 0;
     var skipped: u64 = 0;
     var failed: u64 = 0;
     const stderr = if (enable_print) std.io.getStdErr() else {};
     for (builtin.test_functions) |test_fn| {
+        if (enable_print and print_all) {
+            stderr.writeAll(test_fn.name) catch {};
+            stderr.writeAll("... ") catch {};
+        }
         test_fn.func() catch |err| {
-            if (enable_print) stderr.writeAll(test_fn.name) catch {};
+            if (enable_print and !print_all) {
+                stderr.writeAll(test_fn.name) catch {};
+                stderr.writeAll("... ") catch {};
+            }
             if (err != error.SkipZigTest) {
-                if (enable_print) stderr.writeAll("... FAIL\n") catch {};
+                if (enable_print) stderr.writeAll("FAIL\n") catch {};
                 failed += 1;
                 if (!enable_print) return err;
                 continue;
             }
-            if (enable_print) stderr.writeAll("... SKIP\n") catch {};
+            if (enable_print) stderr.writeAll("SKIP\n") catch {};
             skipped += 1;
             continue;
         };
-        //if (enable_print) stderr.writeAll("... PASS\n") catch {};
+        if (enable_print and print_all) stderr.writeAll("PASS\n") catch {};
         passed += 1;
     }
     if (enable_print) {