summaryrefslogtreecommitdiff
path: root/tests/stack_protector_test.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-02-14 16:33:52 -0800
committerElliott Hughes <enh@google.com>2013-02-14 16:35:58 -0800
commit7fd803cdfa873c01138dcbd614ec92418169b1c2 (patch)
tree7cf2172c26930b783a5e19106b35364c8964504d /tests/stack_protector_test.cpp
parent0a2cb815974ea96af664fa966079966a08916722 (diff)
Fix the stack protector death test.
Now __stack_chk_fail calls abort(3) directly, we terminate with SIGSEGV rather than SIGABRT. (Because of the workaround for the debuggerd lossage in the abort(3) implementation, which was the motivation for switching __stack_chk_fail over to abort(3).) Also clarify the comment on the weird pthread death test, so it doesn't get copied and pasted onto real death tests. Change-Id: Ie832eaded61359c99e7a10db65e28f35e8f63eed
Diffstat (limited to 'tests/stack_protector_test.cpp')
-rw-r--r--tests/stack_protector_test.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/stack_protector_test.cpp b/tests/stack_protector_test.cpp
index 97d5ad62e..7946bbc6e 100644
--- a/tests/stack_protector_test.cpp
+++ b/tests/stack_protector_test.cpp
@@ -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