commit d75b5f11e3442e40eb614cda72fd0547c065d430
author Doug Evans <dje@google.com> Fri May 17 19:20:50 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri May 17 19:20:50 2019 +0000
tree c117b48681286ea6c8dbf0b087094dbbd333c970
parent d31e5b0a154232bccc78297192b470bbed4506cd

[zircon debugger-test] Account for timing variations in run signal appearance

FLK-237 #done

Change-Id: I752ba078c57bb98cd86afba221ac1f6fa5906e4b

zircon/system/utest/debugger/suspended-reg-access.cpp

diff --git a/zircon/system/utest/debugger/suspended-reg-access.cpp b/zircon/system/utest/debugger/suspended-reg-access.cpp
index eef6358..8990db3 100644
--- a/zircon/system/utest/debugger/suspended-reg-access.cpp
+++ b/zircon/system/utest/debugger/suspended-reg-access.cpp
@@ -535,9 +535,15 @@
     // and processed before the waiter thread exits.
     EXPECT_EQ(data.segv_count.load(), kNumSegvTries);
     EXPECT_EQ(data.suspend_count.load(), kNumSegvTries);
-    // There's an initial "RUNNING" signal that the handler will see.
-    // That is why we add one here.
-    EXPECT_EQ(data.resume_count.load(), kNumSegvTries + 1);
+    // There's an initial "RUNNING" signal that the handler could see,
+    // or it might get delayed and essentially folded into a later one.
+    // That is why we allow for potentially seeing an extra one here.
+    static const char actual_format[] = "actual resume count: %d";
+    char actual_msg[sizeof(actual_format) + 20];
+    sprintf(actual_msg, actual_format, data.resume_count.load());
+    EXPECT_TRUE(data.resume_count.load() == kNumSegvTries ||
+                data.resume_count.load() == kNumSegvTries + 1,
+                actual_msg);
 
     tu_handle_close(data.thread_handle);
     tu_handle_close(eport);