diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-09-25 23:00:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-09-25 23:02:50 +0200 |
| commit | 9bce38ee6660bd4216f72966b6b44815dc5922ce (patch) | |
| tree | 2e81b6e5f8487b8fc2474ddb2f5d1468adb0ab21 /vcl | |
| parent | ee777116d01511060cff8b845126fecbad038234 (diff) | |
vcl: try to make clang tinderbox happy about new timer test
Change-Id: I15ae1693e92e430c78b5d73c12a7bae297c098bb
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/timer.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 99d71a9ad923..d432f8a75f1f 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -46,13 +46,18 @@ class TimerTest : public test::BootstrapFixture public: TimerTest() : BootstrapFixture(true, false) {} +#ifdef TEST_WATCHDOG void testWatchdog(); +#endif void testDurations(); void testAutoTimer(); void testRecursiveTimer(); void testSlowTimerCallback(); CPPUNIT_TEST_SUITE(TimerTest); +#ifdef TEST_WATCHDOG + CPPUNIT_TEST(testWatchdog); +#endif CPPUNIT_TEST(testDurations); CPPUNIT_TEST(testAutoTimer); CPPUNIT_TEST(testRecursiveTimer); @@ -61,6 +66,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; +#ifdef TEST_WATCHDOG void TimerTest::testWatchdog() { // out-wait the watchdog. @@ -69,6 +75,7 @@ void TimerTest::testWatchdog() aWait.Nanosec = 0; osl::Thread::wait( aWait ); } +#endif // -------------------------------------------------------------------- @@ -83,7 +90,7 @@ public: Start(); mrBool = false; } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { mrBool = true; Application::EndYield(); @@ -117,7 +124,7 @@ public: Start(); mrCount = 0; } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { mrCount++; } @@ -142,7 +149,7 @@ public: SetTimeout( nMS ); Start(); } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { for (int i = 0; i < 100; i++) Application::Yield(); @@ -171,7 +178,7 @@ public: Start(); mbSlow = false; } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { TimeValue aWait; aWait.Seconds = 1; |