commit f03cecc4e21cc2843fe331b598fab4ddfc382146
author Christopher Ferris <cferris@google.com> Wed Jun 26 18:54:08 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 26 18:54:08 2019 -0700
tree 663d44a430e08a74661eece9ad1b1db57defb3ce
parent 7dda7a50576e566670b80a958b99693eb9aa7914
parent 3d488c61b206a1f997f2d0f55b62554cd1e0f55e

Merge "Increase timeout to avoid flaky tests." am: a484817fc8
am: a29a615ece

Change-Id: I67d831f0fb1624f9d1b97ec90dc42e38599d6424

debuggerd/debuggerd_test.cpp

diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp
index 64df53e..1f0e420 100644
--- a/debuggerd/debuggerd_test.cpp
+++ b/debuggerd/debuggerd_test.cpp
@@ -243,9 +243,10 @@
 
 void CrasherTest::AssertDeath(int signo) {
   int status;
-  pid_t pid = TIMEOUT(5, waitpid(crasher_pid, &status, 0));
+  pid_t pid = TIMEOUT(10, waitpid(crasher_pid, &status, 0));
   if (pid != crasher_pid) {
-    printf("failed to wait for crasher (pid %d)\n", crasher_pid);
+    printf("failed to wait for crasher (expected pid %d, return value %d): %s\n", crasher_pid, pid,
+           strerror(errno));
     sleep(100);
     FAIL() << "failed to wait for crasher: " << strerror(errno);
   }