unwind test: make it less brittle with expected failures

Author: rootbeer

test/standalone/stack_iterator/unwind.zig

@@ -30,24 +30,18 @@ var skip_frames: AddrArray = undefined;
 const expect_signal_frame_overflow =
     (native_arch == .arm and link_libc); // loops above main()
 
-// not reliably loopy?
-//    ((native_arch == .aarch64 or
-//          native_arch == .aarch64_be) and !link_libc); // loops on first step
-
 // Getting the backtrace inside the signal handler (with the ucontext_t)
 // does not contain the expected content on some systems:
 const expect_signal_frame_useless =
     (native_arch == .x86_64 and link_libc and builtin.abi.isGnu()) or // stuck on pthread_kill?
     (native_arch == .x86_64 and link_libc and builtin.abi.isMusl() and builtin.omit_frame_pointer) or // immediately confused backtrace
-    //((native_arch == .aarch64 or
-    //      native_arch == .aarch64_be) and link_libc) or // loops on first step -- not reliably loopy?
     (native_arch == .riscv64 and link_libc) or // `ucontext_t` not defined yet
     native_arch == .mips or
     native_arch == .mipsel or
     native_arch == .mips64 or
     native_arch == .mips64el or
     native_arch == .powerpc64 or
-    native_arch == .powerpc64le; // loops on first step
+    native_arch == .powerpc64le;
 
 // Signal handler to test backtraces from the given signal context.
 fn testFromSigUrg(sig: i32, info: *const posix.siginfo_t, ctx_ptr: ?*anyopaque) callconv(.c) void {
@@ -249,14 +243,13 @@ pub fn main() !void {
     }
 
     if (signal_frames.len == signal_frames.capacity()) {
-        std.debug.print("signal_frames contains too many frames: {}\n", .{signal_frames.len});
-        fail_count += 1;
-    }
-
-    if (expect_signal_frame_overflow) {
-        // The signal_frames backtrace overflows.  Ignore this for now.
-        try testing.expectEqual(1, fail_count);
-        fail_count = 0;
+        if (expect_signal_frame_overflow) {
+            // The signal_frames backtrace overflows.  Ignore this for now.
+            std.debug.print("(expected) signal_frames overflow: {}\n", .{signal_frames.len});
+        } else {
+            std.debug.print("signal_frames contains too many frames: {}\n", .{signal_frames.len});
+            fail_count += 1;
+        }
     }
 
     var found = false;
@@ -276,7 +269,6 @@ pub fn main() !void {
                 found = true;
             }
         }
-        //try testing.expectEqual(found, true);
         if (!found) {
             std.debug.print("full_frames[...] does not include expected[0..4]\n", .{});
             fail_count += 1;
@@ -294,12 +286,10 @@ pub fn main() !void {
             found = true;
         }
     }
-    //try testing.expectEqual(found, true);
-    if (expect_signal_frame_useless) {
-        std.debug.print("(expected) signal_frames[...] does not include expected[0..4]\n", .{});
-        try testing.expectEqual(false, found);
-    } else {
-        if (!found) {
+    if (!found) {
+        if (expect_signal_frame_useless) {
+            std.debug.print("(expected) signal_frames[...] does not include expected[0..4]\n", .{});
+        } else {
             std.debug.print("signal_frames[...] does not include expected[0..4]\n", .{});
             fail_count += 1;
         }