Merge "Fix the stack protector death test."
diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index 931a4c7..4f674c7 100644
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -149,12 +149,12 @@
pthread_exit(NULL);
}
-// We have to say "DeathTest" here so gtest knows to run this test (which exits)
-// in its own process.
+// Even though this isn't really a death test, we have to say "DeathTest" here so gtest knows to
+// run this test (which exits normally) in its own process.
TEST(pthread_DeathTest, pthread_bug_37410) {
// http://code.google.com/p/android/issues/detail?id=37410
::testing::FLAGS_gtest_death_test_style = "threadsafe";
- EXPECT_EXIT(TestBug37410(), ::testing::ExitedWithCode(0), "");
+ ASSERT_EXIT(TestBug37410(), ::testing::ExitedWithCode(0), "");
}
#endif
diff --git a/tests/stack_protector_test.cpp b/tests/stack_protector_test.cpp
index 97d5ad6..7946bbc 100644
--- a/tests/stack_protector_test.cpp
+++ b/tests/stack_protector_test.cpp
@@ -117,11 +117,9 @@
__stack_chk_guard = 0x12345678;
}
-// We have to say "DeathTest" here so gtest knows to run this test (which exits)
-// in its own process.
TEST(stack_protector_DeathTest, modify_stack_protector) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
- ASSERT_EXIT(do_modify_stack_chk_guard(), testing::KilledBySignal(SIGABRT), "");
+ ASSERT_EXIT(do_modify_stack_chk_guard(), testing::KilledBySignal(SIGSEGV), "");
}
#endif