configure.ac            |    4 ----
 src/test/importtest.cpp |    2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 7128ea06e51c712a549d95237093b836eee4db8f
Author: David Tardon <dtar...@redhat.com>
Date:   Wed Aug 5 17:03:50 2015 +0200

    only run the char bg. color test with new libxml2
    
    Change-Id: I74e342d5e1d79f1f5a162d5a0d5bb659cf7c49da

diff --git a/configure.ac b/configure.ac
index a075e73..1611dcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,10 +128,6 @@ AS_IF([test "x$enable_tools" = "xyes"], [
        PKG_CHECK_MODULES([REVENGE_STREAM],[
                librevenge-stream-0.0
        ])
-        PKG_CHECK_EXISTS([libxml-2.0 >= 2.9.2],
-                [],
-                [AC_MSG_ERROR([libxml2 >= 2.9.2 is needed to run tests])]
-        )
 ])
 AC_SUBST([REVENGE_GENERATORS_CFLAGS])
 AC_SUBST([REVENGE_GENERATORS_LIBS])
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index 0296380..82d27f0 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -156,7 +156,9 @@ class ImportTest : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST(testVsdUserDefinedMetadata);
   CPPUNIT_TEST(testVsdxUserDefinedMetadata);
   CPPUNIT_TEST(testVsdxImportBgColorFromTheme);
+#if LIBXML_VERSION >= 20902
   CPPUNIT_TEST(testVsdxCharBgColor);
+#endif
   CPPUNIT_TEST_SUITE_END();
 
   void testVsdxMetadataTitle();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to