summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-10-05 05:49:40 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-10-05 05:49:40 +0000
commit5f4d53c8ef453c82f87095711dd072370d496c0b (patch)
tree27dd5c9e2b7aeef27967f2d26e29b9d7e4aa1180
parentcdfd81f8a41c4604c5dbb26ee7f3cc1b3184afe5 (diff)
downloadgoogletest-5f4d53c8ef453c82f87095711dd072370d496c0b.tar.gz
Fixes test failure on 32-bit Ubuntu.
git-svn-id: http://googletest.googlecode.com/svn/trunk@598 861a406c-534a-0410-8894-cb66d6ee9925
-rw-r--r--test/gtest-death-test_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc
index afbdf8a..15f6719 100644
--- a/test/gtest-death-test_test.cc
+++ b/test/gtest-death-test_test.cc
@@ -397,8 +397,9 @@ void SetSigprofActionAndTimer() {
// Disables ITIMER_PROF timer and ignores SIGPROF signal.
void DisableSigprofActionAndTimer(struct sigaction* old_signal_action) {
struct itimerval timer;
+ timer.it_interval.tv_sec = 0;
timer.it_interval.tv_usec = 0;
- timer.it_value.tv_usec = 0;
+ timer.it_value = timer.it_interval;
ASSERT_EQ(0, setitimer(ITIMER_PROF, &timer, NULL));
struct sigaction signal_action;
memset(&signal_action, 0, sizeof(signal_action));