vcl/qa/cppunit/timer.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 8f999b555bfc6d4789916d381e38c2eb674fd26e
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Jul 20 12:56:24 2017 +0200
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
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 3b28f56f4cda..dd03c20bbc1f 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -55,8 +55,10 @@ class TimerTest : public test::BootstrapFixture
public:
TimerTest() : BootstrapFixture(true, false) {}
- void testIdleMainloop();
void testIdle();
+#ifndef WIN32
+ void testIdleMainloop();
+#endif
#ifdef TEST_WATCHDOG
void testWatchdog();
#endif
@@ -75,7 +77,9 @@ public:
CPPUNIT_TEST_SUITE(TimerTest);
CPPUNIT_TEST(testIdle);
+#ifndef WIN32
CPPUNIT_TEST(testIdleMainloop);
+#endif
#ifdef TEST_WATCHDOG
CPPUNIT_TEST(testWatchdog);
#endif
@@ -130,10 +134,10 @@ void TimerTest::testIdle()
CPPUNIT_ASSERT_MESSAGE("idle triggered", bTriggered);
}
+#ifndef WIN32
// tdf#91727
void TimerTest::testIdleMainloop()
{
-#ifndef _WIN32
bool bTriggered = false;
IdleBool aTest( bTriggered );
// coverity[loop_top] - Application::Yield allows the timer to fire and
toggle bDone
@@ -148,9 +152,8 @@ void TimerTest::testIdleMainloop()
pSVData->maAppData.mnDispatchLevel--;
}
CPPUNIT_ASSERT_MESSAGE("mainloop idle triggered", bTriggered);
-#endif
}
-
+#endif
class TimerBool : public Timer
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
