Merge "Remove timeout signal in ptrace test."

am: bd6a5e0f70

Change-Id: I484dbfdde61383e472a026c6ae40ab1646f17422
This commit is contained in:
Yabin Cui 2017-11-29 22:06:48 +00:00 committed by android-build-merger
commit 92ce17f63e

View file

@ -271,18 +271,8 @@ static void watchpoint_imprecise_child(Uint128_t& data) {
// test fail on arm64, you will likely need to cherry-pick fdfeff0f into your // test fail on arm64, you will likely need to cherry-pick fdfeff0f into your
// kernel. // kernel.
TEST(sys_ptrace, watchpoint_imprecise) { TEST(sys_ptrace, watchpoint_imprecise) {
// Make sure we get interrupted in case a buggy kernel does not report the // This test relies on the infrastructure to timeout if the test hangs.
// watchpoint hit correctly.
struct sigaction action, oldaction;
action.sa_handler = [](int) {};
sigemptyset(&action.sa_mask);
action.sa_flags = 0;
ASSERT_EQ(0, sigaction(SIGALRM, &action, &oldaction)) << strerror(errno);
alarm(5);
run_watchpoint_test<Uint128_t>(watchpoint_imprecise_child, 8, sizeof(void*)); run_watchpoint_test<Uint128_t>(watchpoint_imprecise_child, 8, sizeof(void*));
ASSERT_EQ(0, sigaction(SIGALRM, &oldaction, nullptr)) << strerror(errno);
} }
static void __attribute__((noinline)) breakpoint_func() { static void __attribute__((noinline)) breakpoint_func() {