[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sd/qa

[Miklos Vajna]

 sd/qa/unit/import-tests.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d5d571f20ec0a5ea4db4716a2b9e78713df10434
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue May 10 14:12:07 2016 +0200

    CppunitTest_sd_import_tests: disable test that fails on Linux baseline
    
    Change-Id: Ifb5a6eff5b90ae5c8c90a90b1217574494b6e612
    Reviewed-on: https://gerrit.libreoffice.org/24845
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mikekaganski at hotmail.com>

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 2f74f13..326495b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -1173,6 +1173,7 @@ void SdImportTest::testTdf93097()
 
 void SdImportTest::testTdf93124()
 {
+#if defined(MACOSX) || defined(WNT)
     sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/ppt/tdf93124.ppt"), PPT);
     uno::Reference < uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
     uno::Reference< drawing::XGraphicExportFilter > xGraphicExporter = drawing::GraphicExportFilter::create(xContext);
@@ -1214,6 +1215,7 @@ void SdImportTest::testTdf93124()
         }
     CPPUNIT_ASSERT_MESSAGE("Tdf93124: vertical alignment of text is incorrect!", nNonWhiteCount>100);
     xDocShRef->DoClose();
+#endif
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);