[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac sc/qa

[Markus Mohrhard]

 config_host/config_features.h.in      |    5 +++++
 configure.ac                          |    1 +
 sc/qa/unit/subsequent_export-test.cxx |    5 +++++
 3 files changed, 11 insertions(+)

New commits:
commit d1a594686a704a7b0d255fd90f9c017b2318e560
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 16 16:44:43 2017 +0200

    try to fix the tests that depend on fonts
    
    This should help with some of the RandomConfig tb failures.
    
    Change-Id: I83af9c2c50fa2f3044e7507a1b902807536452dd
    Reviewed-on: https://gerrit.libreoffice.org/36581
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 2df958a1cf09..8c5de70a84e8 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -184,4 +184,9 @@
  */
 #define HAVE_FEATURE_PDFIUM 0
 
+/*
+ * Whether extra fonts are available
+ */
+#define HAVE_MORE_FONTS 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index e2ba3df087de..1e52d32e7029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11305,6 +11305,7 @@ if test "$with_fonts" != "no"; then
     AC_MSG_RESULT([yes])
     WITH_FONTS=TRUE
     BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
+    AC_DEFINE(HAVE_MORE_FONTS)
 else
     AC_MSG_RESULT([no])
     WITH_FONTS=
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index fff91e78bbe9..08a5033111b8 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -11,6 +11,7 @@
 #include <sal/config.h>
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
+#include <config_features.h>
 
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
@@ -215,10 +216,14 @@ public:
     CPPUNIT_TEST(testFormatExportODS);
 
     CPPUNIT_TEST(testCommentExportXLSX);
+#if HAVE_MORE_FONTS
     CPPUNIT_TEST(testCustomColumnWidthExportXLSX);
+#endif
     CPPUNIT_TEST(testXfDefaultValuesXLSX);
     CPPUNIT_TEST(testColumnWidthResaveXLSX);
+#if HAVE_MORE_FONTS
     CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX);
+#endif
     CPPUNIT_TEST(testOutlineExportXLSX);
     CPPUNIT_TEST(testHiddenEmptyRowsXLSX);
     CPPUNIT_TEST(testAllRowsHiddenXLSX);