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

Khaled Hosny khaledhosny at eglug.org
Mon Apr 30 23:31:44 UTC 2018


 vcl/qa/cppunit/pdfexport/pdfexport.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8a2745e1beee722c8c9691c397e493cc1160bedf
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Tue May 1 00:27:47 2018 +0200

    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 at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

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()


More information about the Libreoffice-commits mailing list