generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix the stack protector death test."

Browse Source
This commit is contained in:
Elliott Hughes 2013-02-15 02:10:29 +00:00 committed by Gerrit Code Review
commit 3e3b239d2b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/pthread_test.cpp
View File

@ -149,12 +149,12 @@ static void TestBug37410() {
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

4
tests/stack_protector_test.cpp
View File

@ -117,11 +117,9 @@ static void do_modify_stack_chk_guard() {
__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