diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-05 05:49:40 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-05 05:49:40 +0000 |
| commit | 879916a9393ef4af84ebe8b331220586dd8cafbb (patch) | |
| tree | 27dd5c9e2b7aeef27967f2d26e29b9d7e4aa1180 | |
| parent | f7d58e81c35b37851733a7518c9f7260ba1b8a40 (diff) | |
| download | googletest-879916a9393ef4af84ebe8b331220586dd8cafbb.tar.gz googletest-879916a9393ef4af84ebe8b331220586dd8cafbb.tar.bz2 googletest-879916a9393ef4af84ebe8b331220586dd8cafbb.zip | |
Fixes test failure on 32-bit Ubuntu.
| -rw-r--r-- | test/gtest-death-test_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc index afbdf8a2..15f6719b 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)); |