summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2018-05-01 00:27:47 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2018-05-01 01:31:22 +0200
commit8a2745e1beee722c8c9691c397e493cc1160bedf (patch)
tree119b26e1b2ab0f817f284a2baf517cca2140aac0
parentofz#8095 avoid recurse to death (diff)
downloadcore-8a2745e1beee722c8c9691c397e493cc1160bedf.tar.gz
core-8a2745e1beee722c8c9691c397e493cc1160bedf.zip
These tests should check for HAVE_MORE_FONTS
TEST_FONTS_MISSING checks only for DejaVu and Carlito, besides even if the system has a font with the same name it does not mean it is the same version (or even the same font) as the test requires. So better limit this to builds not using --without-fonts. Change-Id: I9d5b9e6aaed65513d37e4c897fcdddf0ac050084 Reviewed-on: https://gerrit.libreoffice.org/53676 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
-rw-r--r--vcl/qa/cppunit/pdfexport/pdfexport.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index e1a7b711a29d..1f527239dea7 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -68,7 +68,7 @@ public:
void testTdf99680();
void testTdf99680_2();
void testTdf108963();
-#if !TEST_FONTS_MISSING
+#if HAVE_MORE_FONTS
/// Test writing ToUnicode CMAP for LTR ligatures.
void testTdf115117_1();
/// Text extracting LTR text with ligatures.
@@ -102,7 +102,7 @@ public:
CPPUNIT_TEST(testTdf99680);
CPPUNIT_TEST(testTdf99680_2);
CPPUNIT_TEST(testTdf108963);
-#if !TEST_FONTS_MISSING
+#if HAVE_MORE_FONTS
CPPUNIT_TEST(testTdf115117_1);
CPPUNIT_TEST(testTdf115117_1a);
CPPUNIT_TEST(testTdf115117_2);
@@ -788,7 +788,7 @@ void PdfExportTest::testTdf108963()
CPPUNIT_ASSERT_EQUAL(1, nYellowPathCount);
}
-#if !TEST_FONTS_MISSING
+#if HAVE_MORE_FONTS
// This requires Carlito font, if it is missing the test will most likely
// fail.
void PdfExportTest::testTdf115117_1()