suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove barrier to fix Android build.

Browse source 
The unittest for #752 made use of pthread_barrier_t, which is not
supported on Android. This change replaces the barrier code with a
simple sleep, which proved sufficient to trigger the race. It only
affects the test and does not affect the original fix for #752.

Change-Id: I82c32cf00899176fa09089e716ed85850b8711e6
Reviewed-on: https://chromium-review.googlesource.com/895168
Reviewed-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Lars Volker 2018-01-31 11:10:01 -08:00 committed by Mike Frysinger
parent fd99ff473c
commit 242327485d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/linux/handler/exception_handler_unittest.cc
View file

@ -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,