Kaydet (Commit) 8f999b55 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

Don't run testIdleMainloop on Windows

Was just wondering, why the test finished so fast on Windows,
and realized it's actually empty due to "#ifndef WIN32".

Change-Id: I050b7cb7bd66bdd2a215ef6e7eaf26355e8d962f
üst 8bedbc3f
...@@ -55,8 +55,10 @@ class TimerTest : public test::BootstrapFixture ...@@ -55,8 +55,10 @@ class TimerTest : public test::BootstrapFixture
public: public:
TimerTest() : BootstrapFixture(true, false) {} TimerTest() : BootstrapFixture(true, false) {}
void testIdleMainloop();
void testIdle(); void testIdle();
#ifndef WIN32
void testIdleMainloop();
#endif
#ifdef TEST_WATCHDOG #ifdef TEST_WATCHDOG
void testWatchdog(); void testWatchdog();
#endif #endif
...@@ -75,7 +77,9 @@ public: ...@@ -75,7 +77,9 @@ public:
CPPUNIT_TEST_SUITE(TimerTest); CPPUNIT_TEST_SUITE(TimerTest);
CPPUNIT_TEST(testIdle); CPPUNIT_TEST(testIdle);
#ifndef WIN32
CPPUNIT_TEST(testIdleMainloop); CPPUNIT_TEST(testIdleMainloop);
#endif
#ifdef TEST_WATCHDOG #ifdef TEST_WATCHDOG
CPPUNIT_TEST(testWatchdog); CPPUNIT_TEST(testWatchdog);
#endif #endif
...@@ -130,10 +134,10 @@ void TimerTest::testIdle() ...@@ -130,10 +134,10 @@ void TimerTest::testIdle()
CPPUNIT_ASSERT_MESSAGE("idle triggered", bTriggered); CPPUNIT_ASSERT_MESSAGE("idle triggered", bTriggered);
} }
#ifndef WIN32
// tdf#91727 // tdf#91727
void TimerTest::testIdleMainloop() void TimerTest::testIdleMainloop()
{ {
#ifndef _WIN32
bool bTriggered = false; bool bTriggered = false;
IdleBool aTest( bTriggered ); IdleBool aTest( bTriggered );
// coverity[loop_top] - Application::Yield allows the timer to fire and toggle bDone // coverity[loop_top] - Application::Yield allows the timer to fire and toggle bDone
...@@ -148,9 +152,8 @@ void TimerTest::testIdleMainloop() ...@@ -148,9 +152,8 @@ void TimerTest::testIdleMainloop()
pSVData->maAppData.mnDispatchLevel--; pSVData->maAppData.mnDispatchLevel--;
} }
CPPUNIT_ASSERT_MESSAGE("mainloop idle triggered", bTriggered); CPPUNIT_ASSERT_MESSAGE("mainloop idle triggered", bTriggered);
#endif
} }
#endif
class TimerBool : public Timer class TimerBool : public Timer
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment