[Libreoffice-commits] core.git: desktop/qa

Markus Mohrhard markus.mohrhard at googlemail.com
Sat May 20 03:52:10 UTC 2017


 desktop/qa/desktop_lib/test_desktop_lib.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit d6e4d4ef54317e7cb70f23fff272e4217787d141
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 20 05:51:00 2017 +0200

    conditionally disable test that depends on additional fonts
    
    Change-Id: Idb066bf9dcaf0d606327214c9628fc12fefc7b19

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 79ec0ba54e3b..c5ee03fb56ca 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -39,6 +39,7 @@
 #include <comphelper/scopeguard.hxx>
 #include <cairo.h>
 #include <ostream>
+#include <config_features.h>
 
 #include <lib/init.hxx>
 
@@ -105,7 +106,9 @@ public:
     void testRedlineCalc();
     void testPaintPartTile();
     void testWriterCommentInsertCursor();
+#if HAVE_MORE_FONTS
     void testGetFontSubset();
+#endif
     void testCommentsWriter();
     void testCommentsCalc();
     void testCommentsImpress();
@@ -145,7 +148,9 @@ public:
     CPPUNIT_TEST(testRedlineCalc);
     CPPUNIT_TEST(testPaintPartTile);
     CPPUNIT_TEST(testWriterCommentInsertCursor);
+#if HAVE_MORE_FONTS
     CPPUNIT_TEST(testGetFontSubset);
+#endif
     CPPUNIT_TEST(testCommentsWriter);
     CPPUNIT_TEST(testCommentsCalc);
     CPPUNIT_TEST(testCommentsImpress);
@@ -1828,6 +1833,7 @@ void DesktopLOKTest::testWriterCommentInsertCursor()
     comphelper::LibreOfficeKit::setActive(false);
 }
 
+#if HAVE_MORE_FONTS
 void DesktopLOKTest::testGetFontSubset()
 {
     comphelper::LibreOfficeKit::setActive();
@@ -1851,6 +1857,7 @@ void DesktopLOKTest::testGetFontSubset()
     free(pJSON);
     comphelper::LibreOfficeKit::setActive(false);
 }
+#endif
 
 void DesktopLOKTest::testCommentsWriter()
 {


More information about the Libreoffice-commits mailing list