[libreoffice] 04/04: generalize sc_subsequent_filters_test disabling

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit a4a09763d2f6e83ec3a837d1577c7b3213336024
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu May 4 18:52:02 2017 +0200

    generalize sc_subsequent_filters_test disabling
---
 ..._subsequent_filters_test-with-internal-cppunit.diff} | 17 ++++++++++++++---
 patches/series                                          |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/patches/temporarily-disable-sc_subsequent_filters_test.diff b/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
similarity index 82%
rename from patches/temporarily-disable-sc_subsequent_filters_test.diff
rename to patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
index 4052e19..d505e38 100644
--- a/patches/temporarily-disable-sc_subsequent_filters_test.diff
+++ b/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
@@ -7,13 +7,13 @@
 # /data/rene/git/LibreOffice/master/solenv/gbuild/LinkTarget.mk:598: recipe for target '/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so' failed
 # make[4]: *** [/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so] Error 1
 #
-# interestingly, this works with system-cppunit, so this patch can be removed when we can use that
+# interestingly, this works with system-cppunit...
 
 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
-index ef82147d781b..b3cadf5d7102 100644
+index ef82147d781b..f737236d40c3 100644
 --- a/sc/Module_sc.mk
 +++ b/sc/Module_sc.mk
-@@ -53,7 +53,6 @@ endif
+@@ -53,12 +53,17 @@ endif
  $(eval $(call gb_Module_add_slowcheck_targets,sc, \
  	CppunitTest_sc_condformats \
  	CppunitTest_sc_new_cond_format_api \
@@ -21,3 +21,14 @@ index ef82147d781b..b3cadf5d7102 100644
  	CppunitTest_sc_subsequent_export_test \
  	CppunitTest_sc_html_export_test \
  	CppunitTest_sc_copypaste \
+ ))
+ 
++ifneq ($(SYSTEM_CPPUNIT),TRUE)
++$(eval $(call gb_Module_add_slowcheck_targets,sc, \
++	CppunitTest_sc_subsequent_filters_test \
++))
++endif
++
+ # Various function tests fail in 32-bit linux_x86 build due to dreaded floating
+ # point weirdness (x87, registers, compiler optimization, ... whatever),
+ # disable them until someone finds a real cure.
diff --git a/patches/series b/patches/series
index 33263f7..45cd6cb 100644
--- a/patches/series
+++ b/patches/series
@@ -31,4 +31,4 @@ no-openssl.diff
 fix-disable-pdfium-build.diff
 fix-enable-mergelibs-build.diff
 fix-wpft-impress-test-filename.diff
-temporarily-disable-sc_subsequent_filters_test.diff
+disable-sc_subsequent_filters_test-with-internal-cppunit.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git