diff options
Diffstat (limited to 'src/client/linux')
| -rw-r--r-- | src/client/linux/handler/exception_handler_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc index 50edb3b2..d05f3eb9 100644 --- a/src/client/linux/handler/exception_handler_unittest.cc +++ b/src/client/linux/handler/exception_handler_unittest.cc @@ -270,6 +270,7 @@ static void* CrashFunction(void* b_ptr) { return NULL; } +#if !defined(__ANDROID_API__) || __ANDROID_API__ >= __ANDROID_API_N__ // Tests that concurrent crashes do not enter a loop by alternately triggering // the signal handler. TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) { @@ -306,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) { } // Wait a while until the child should have crashed. - usleep(100000); + usleep(1000000); // Kill the child if it is still running. kill(child, SIGKILL); @@ -315,6 +316,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) { // SIGKILL. ASSERT_NO_FATAL_FAILURE(WaitForProcessToTerminate(child, SIGSEGV)); } +#endif static bool DoneCallbackReturnFalse(const MinidumpDescriptor& descriptor, void* context, |