diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 0f6b29f1c68d..9c331bbd85ee 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -47,9 +47,14 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_rangelst_test \ CppunitTest_sc_mark_test \ CppunitTest_sc_core \ - CppunitTest_sc_tiledrendering \ )) +ifeq ($(OS),LINUX) +$(eval $(call gb_Module_add_check_targets,sc,\ + CppunitTest_sc_tiledrendering \ +)) +endif + $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_condformats \ CppunitTest_sc_new_cond_format_api \ diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 9ae9f01be2ce..24bbbcee8d65 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -36,9 +36,7 @@ using namespace css; -#if !defined(WNT) && !defined(MACOSX) static const char* DATA_DIRECTORY = "/sc/qa/unit/tiledrendering/data/"; -#endif class ScTiledRenderingTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools { @@ -47,44 +45,34 @@ public: virtual void setUp() SAL_OVERRIDE; virtual void tearDown() SAL_OVERRIDE; -#if !defined(WNT) && !defined(MACOSX) void testRowColumnSelections(); void testSortAscendingDescending(); void testPartHash(); void testDocumentSize(); void testEmptyColumnSelection(); -#endif CPPUNIT_TEST_SUITE(ScTiledRenderingTest); -#if !defined(WNT) && !defined(MACOSX) CPPUNIT_TEST(testRowColumnSelections); CPPUNIT_TEST(testSortAscendingDescending); CPPUNIT_TEST(testPartHash); CPPUNIT_TEST(testDocumentSize); CPPUNIT_TEST(testEmptyColumnSelection); -#endif CPPUNIT_TEST_SUITE_END(); private: -#if !defined(WNT) && !defined(MACOSX) ScModelObj* createDoc(const char* pName); static void callback(int nType, const char* pPayload, void* pData); void callbackImpl(int nType, const char* pPayload); /// document size changed callback. osl::Condition m_aDocSizeCondition; -#endif uno::Reference mxComponent; -#if !defined(WNT) && !defined(MACOSX) // TODO various test-related members - when needed -#endif }; ScTiledRenderingTest::ScTiledRenderingTest() -#if !defined(WNT) && !defined(MACOSX) // TODO various test-related members - when needed -#endif { } @@ -103,7 +91,6 @@ void ScTiledRenderingTest::tearDown() test::BootstrapFixture::tearDown(); } -#if !defined(WNT) && !defined(MACOSX) ScModelObj* ScTiledRenderingTest::createDoc(const char* pName) { if (mxComponent.is()) @@ -360,8 +347,6 @@ void ScTiledRenderingTest::testEmptyColumnSelection() comphelper::LibreOfficeKit::setActive(false); } -#endif - CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest); CPPUNIT_PLUGIN_IMPLEMENT();