[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - configure.ac vcl/qa

[Rene Engelhard]

 configure.ac                   |    5 ++++-
 vcl/qa/cppunit/complextext.cxx |    6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit f72cd59560acaeb9e70174df2591b21b5d882e97
Author: Rene Engelhard <rene at debian.org>
Date:   Mon May 22 20:00:43 2017 +0200

    test for DejaVuSans
    
    Change-Id: I963c9a9ac0239af5550de50f39f080b9f19d494f
    Reviewed-on: https://gerrit.libreoffice.org/37920
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>

diff --git a/configure.ac b/configure.ac
index c12fe95a561c..35497b23cb58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11290,7 +11290,8 @@ test_font_map()
     then
         AC_MSG_RESULT([ok])
     else
-        AC_MSG_RESULT([unknown ($FONTFILE)])
+        AC_MSG_WARN([unknown ($FONTFILE)])
+        add_warning "unknown ($FONTFILE)"
         TEST_FONTS_MISSING=1
     fi
 }
@@ -11315,9 +11316,11 @@ else
             TEST_FONTS_MISSING=1
         else
             test_font_map 'Calibri' 'Carlito'
+            test_font_map 'DejaVuSans' 'DejaVuSans'
             if test ${TEST_FONTS_MISSING} -eq 1
             then
                 AC_MSG_WARN([Unknown font mappings - unit tests disabled.])
+                add_warning "Unknown font mappings - unit tests disabled."
             fi
         fi
     else
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 073ff40461e2..5828a16c77a4 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -19,6 +19,8 @@ std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
 #include <osl/file.hxx>
 #include <osl/process.h>
 
+#include <config_test.h>
+
 std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
 {
     rStream << "{ ";
@@ -41,13 +43,16 @@ public:
 #endif
 
     CPPUNIT_TEST_SUITE(VclComplexTextTest);
+#if !TEST_FONTS_MISSING
     CPPUNIT_TEST(testArabic);
+#endif
 #if defined(_WIN32)
     CPPUNIT_TEST(testTdf95650);
 #endif
     CPPUNIT_TEST_SUITE_END();
 };
 
+#if !TEST_FONTS_MISSING
 void VclComplexTextTest::testArabic()
 {
     const unsigned char pOneTwoThreeUTF8[] = {
@@ -121,6 +126,7 @@ void VclComplexTextTest::testArabic()
     (void)aRect; (void)aRectRot;
 #endif
 }
+#endif
 
 #if defined(_WIN32)
 void VclComplexTextTest::testTdf95650()