diff options
| author | David Tardon <dtardon@redhat.com> | 2015-12-17 15:44:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-06 08:20:56 +0000 |
| commit | 451c814d518527e77725a7ac9a99cd22fa08914c (patch) | |
| tree | 717f440e68b42a0d86496988800ea4e7f9e06dad /writerperfect | |
| parent | 988a258fe7437b8763d2094bca1f0776ccd21eaa (diff) | |
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@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/qa/unit/WpftImportTestBase.hxx | 3 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftWriterFilterTest.cxx | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx index 514561f43d66..7e2098773dd6 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 00eb88a406a4..9e8bd02c0b3e 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); |