Kaydet (Commit) d6e4d4ef authored tarafından Markus Mohrhard's avatar Markus Mohrhard

conditionally disable test that depends on additional fonts

Change-Id: Idb066bf9dcaf0d606327214c9628fc12fefc7b19
üst 91c9e060
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <comphelper/scopeguard.hxx> #include <comphelper/scopeguard.hxx>
#include <cairo.h> #include <cairo.h>
#include <ostream> #include <ostream>
#include <config_features.h>
#include <lib/init.hxx> #include <lib/init.hxx>
...@@ -105,7 +106,9 @@ public: ...@@ -105,7 +106,9 @@ public:
void testRedlineCalc(); void testRedlineCalc();
void testPaintPartTile(); void testPaintPartTile();
void testWriterCommentInsertCursor(); void testWriterCommentInsertCursor();
#if HAVE_MORE_FONTS
void testGetFontSubset(); void testGetFontSubset();
#endif
void testCommentsWriter(); void testCommentsWriter();
void testCommentsCalc(); void testCommentsCalc();
void testCommentsImpress(); void testCommentsImpress();
...@@ -145,7 +148,9 @@ public: ...@@ -145,7 +148,9 @@ public:
CPPUNIT_TEST(testRedlineCalc); CPPUNIT_TEST(testRedlineCalc);
CPPUNIT_TEST(testPaintPartTile); CPPUNIT_TEST(testPaintPartTile);
CPPUNIT_TEST(testWriterCommentInsertCursor); CPPUNIT_TEST(testWriterCommentInsertCursor);
#if HAVE_MORE_FONTS
CPPUNIT_TEST(testGetFontSubset); CPPUNIT_TEST(testGetFontSubset);
#endif
CPPUNIT_TEST(testCommentsWriter); CPPUNIT_TEST(testCommentsWriter);
CPPUNIT_TEST(testCommentsCalc); CPPUNIT_TEST(testCommentsCalc);
CPPUNIT_TEST(testCommentsImpress); CPPUNIT_TEST(testCommentsImpress);
...@@ -1828,6 +1833,7 @@ void DesktopLOKTest::testWriterCommentInsertCursor() ...@@ -1828,6 +1833,7 @@ void DesktopLOKTest::testWriterCommentInsertCursor()
comphelper::LibreOfficeKit::setActive(false); comphelper::LibreOfficeKit::setActive(false);
} }
#if HAVE_MORE_FONTS
void DesktopLOKTest::testGetFontSubset() void DesktopLOKTest::testGetFontSubset()
{ {
comphelper::LibreOfficeKit::setActive(); comphelper::LibreOfficeKit::setActive();
...@@ -1851,6 +1857,7 @@ void DesktopLOKTest::testGetFontSubset() ...@@ -1851,6 +1857,7 @@ void DesktopLOKTest::testGetFontSubset()
free(pJSON); free(pJSON);
comphelper::LibreOfficeKit::setActive(false); comphelper::LibreOfficeKit::setActive(false);
} }
#endif
void DesktopLOKTest::testCommentsWriter() void DesktopLOKTest::testCommentsWriter()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment