diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-05-12 08:11:51 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-05-12 11:21:43 +0200 |
| commit | 46885986e3749bedb02c666a958d8c4499c8eecc (patch) | |
| tree | 5818ee5d423fa5a63ad80ba291bd3f407254b576 /sw/qa/extras | |
| parent | 1932f4b04a299fc4f478a629f0f97efea8a10c62 (diff) | |
Revert "Enable CppunitTest_sw_odfexport for MACOSX"
This reverts commit fe192a7b7485379625a4d91ad6e3a9e6280add2c.
The mac-mini jenkins buildslaves get stuck on the sw_odfexporttest and
ultimately get killed by the build-timeout. Revert to not tempt people
into bypassing jenkins alltogether.
Change-Id: I6c08657a1957455161882443b88b5d581c888bcf
Reviewed-on: https://gerrit.libreoffice.org/54155
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 00e2081341f0..54addc96a5cb 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -13,6 +13,7 @@ #include <initializer_list> +#if !defined(MACOSX) #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/container/XIndexReplace.hpp> @@ -1847,7 +1848,7 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt") DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps, "embedded-font-props.odt") { -#if !defined(MACOSX) && !defined(WNT) +#if !defined(WNT) // Test that font style/weight of embedded fonts is exposed. // Test file is a normal ODT, except EmbedFonts is set to true in settings.xml. if (xmlDocPtr pXmlDoc = parseExport("content.xml")) @@ -1965,10 +1966,8 @@ DECLARE_ODFEXPORT_TEST(testBulletAsImage, "BulletAsImage.odt") Graphic aGraphic(uno::Reference<graphic::XGraphic>(xBitmap, uno::UNO_QUERY)); CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType()); CPPUNIT_ASSERT(aGraphic.GetSizeBytes() > sal_uLong(0)); -#if !defined(MACOSX) //TODO: 17 vs. 15 CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Width()); CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Height()); -#endif } DECLARE_ODFEXPORT_TEST(testSignatureLineProperties, "signatureline-properties.fodt") @@ -2028,5 +2027,7 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, "spellout-numberingtypes.odt" } } +#endif + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |