config_host/config_writerperfect.h.in | 4 ++++
configure.ac | 3 ++-
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 7 ++++++-
writerperfect/qa/unit/WpftImportTestBase.hxx | 3 +++
writerperfect/qa/unit/WpftImpressFilterTest.cxx | 9 ++++++++-
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 7 ++++++-
6 files changed, 29 insertions(+), 4 deletions(-)
New commits:
commit 517e2522adcd7d091009bfd9e9f9704374ec02a7
Author: David Tardon <dtar...@redhat.com>
Date: Thu Dec 17 13:16:29 2015 +0100
do not require newest libetonyek for build
Change-Id: I6e023cd25a1481dd18e3a16b8756c43dde4560ce
(cherry picked from commit 71f92e9a6959b2b468aa4310633e4785d4bd0ea0)
Reviewed-on: https://gerrit.libreoffice.org/20938
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/config_host/config_writerperfect.h.in
b/config_host/config_writerperfect.h.in
index 4331b4f..fea81dd 100644
--- a/config_host/config_writerperfect.h.in
+++ b/config_host/config_writerperfect.h.in
@@ -12,4 +12,8 @@
* version.
*/
+#undef ETONYEK_VERSION_MAJOR
+#undef ETONYEK_VERSION_MINOR
+#undef ETONYEK_VERSION_MICRO
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index b5de019..35792a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7688,7 +7688,8 @@
libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1])
dnl ===================================================================
dnl Check for system libetonyek
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.4])
+libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
dnl ===================================================================
dnl Check for system libfreehand
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 40d1ace..848f7e2 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -31,9 +31,14 @@ WpftCalcFilterTest::WpftCalcFilterTest()
void WpftCalcFilterTest::test()
{
+ const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+ {
+ {"Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
+ };
+
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libmwaw/");
doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libwps/");
- doTest("org.libreoffice.comp.Calc.NumbersImportFilter",
"/writerperfect/qa/unit/data/calc/libetonyek/");
+ doTest("org.libreoffice.comp.Calc.NumbersImportFilter",
"/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional);
}
CPPUNIT_TEST_SUITE_REGISTRATION(WpftCalcFilterTest);
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx
b/writerperfect/qa/unit/WpftImportTestBase.hxx
index 4689f98..1d83586 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_ETONYEK_VERSION(major, minor, micro) \
+ REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR,
ETONYEK_VERSION_MICRO, major, minor, micro)
+
namespace com
{
namespace sun
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 1b5590a..ec16a11 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -31,7 +31,14 @@ WpftImpressFilterTest::WpftImpressFilterTest()
void WpftImpressFilterTest::test()
{
- doTest("org.libreoffice.comp.Impress.KeynoteImportFilter",
"/writerperfect/qa/unit/data/impress/libetonyek/");
+ const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+ {
+ {"v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
+ {"v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
+ {"v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4)},
+ };
+
+ doTest("org.libreoffice.comp.Impress.KeynoteImportFilter",
"/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional);
doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter",
"/writerperfect/qa/unit/data/impress/libmwaw/");
}
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index f8f9f85..a72b206 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -31,11 +31,16 @@ WpftWriterFilterTest::WpftWriterFilterTest()
void WpftWriterFilterTest::test()
{
+ const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+ {
+ {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
+ };
+
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("com.sun.star.comp.Writer.MSWorksImportFilter",
"/writerperfect/qa/unit/data/writer/libwps/");
doTest("com.sun.star.comp.Writer.MWAWImportFilter",
"/writerperfect/qa/unit/data/writer/libmwaw/");
- doTest("org.libreoffice.comp.Writer.PagesImportFilter",
"/writerperfect/qa/unit/data/writer/libetonyek/");
+ doTest("org.libreoffice.comp.Writer.PagesImportFilter",
"/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
doTest("com.sun.star.comp.Writer.WordPerfectImportFilter",
"/writerperfect/qa/unit/data/writer/libwpd/");
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
