[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - config_host/config_writerperfect.h.in configure.ac writerperfect/qa
David Tardon
dtardon at redhat.com
Wed Jan 6 00:21:16 PST 2016
config_host/config_writerperfect.h.in | 4 ++++
configure.ac | 3 ++-
writerperfect/qa/unit/WpftImportTestBase.hxx | 3 +++
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 6 +++++-
4 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 451c814d518527e77725a7ac9a99cd22fa08914c
Author: David Tardon <dtardon at redhat.com>
Date: Thu Dec 17 15:44:43 2015 +0100
do not require newest libe-book for build
(cherry picked from commit 22d0a7bf86da9e795b1bcedae9e18f18245dc2fe)
Change-Id: I4be3de970eabf00fd73b466adc15b6a84528a2d1
Reviewed-on: https://gerrit.libreoffice.org/20940
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/config_host/config_writerperfect.h.in b/config_host/config_writerperfect.h.in
index 0ce167d..b42b3a7 100644
--- a/config_host/config_writerperfect.h.in
+++ b/config_host/config_writerperfect.h.in
@@ -12,6 +12,10 @@
* version.
*/
+#undef EBOOK_VERSION_MAJOR
+#undef EBOOK_VERSION_MINOR
+#undef EBOOK_VERSION_MICRO
+
#undef ETONYEK_VERSION_MAJOR
#undef ETONYEK_VERSION_MINOR
#undef ETONYEK_VERSION_MICRO
diff --git a/configure.ac b/configure.ac
index a964e0d..c5579eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7683,7 +7683,8 @@ libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${
dnl ===================================================================
dnl Check for system libe-book
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1])
+libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
+libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
dnl ===================================================================
dnl Check for system libetonyek
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx
index 514561f..7e20987 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.hxx
@@ -29,6 +29,9 @@
((minor) > (req_minor) \
|| ((minor) == (req_minor) && ((micro) >= (req_micro)))))
+#define REQUIRE_EBOOK_VERSION(major, minor, micro) \
+ REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro)
+
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro)
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 00eb88a..9e8bd02 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -31,6 +31,10 @@ WpftWriterFilterTest::WpftWriterFilterTest()
void WpftWriterFilterTest::test()
{
+ const writerperfect::test::WpftOptionalMap_t aEBookOptional
+ {
+ {"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)},
+ };
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
{
{"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
@@ -47,7 +51,7 @@ void WpftWriterFilterTest::test()
};
doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
- doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");
+ doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional);
doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
More information about the Libreoffice-commits
mailing list