[libreoffice] 01/01: disable one more test with internal cppunit

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 4b682d6ad2731eda4daf3da7c0fa899a3bd06af6
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jul 29 13:28:36 2017 +0200

    disable one more test with internal cppunit
---
 ...iff => disable-some-sc-tests-with-internal-cppunit.diff} | 13 ++++++++++++-
 patches/series                                              |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff b/patches/disable-some-sc-tests-with-internal-cppunit.diff
similarity index 87%
rename from patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
rename to patches/disable-some-sc-tests-with-internal-cppunit.diff
index 292c1f0..516e17c 100644
--- a/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
+++ b/patches/disable-some-sc-tests-with-internal-cppunit.diff
@@ -13,7 +13,16 @@ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
 index ef82147d781b..f737236d40c3 100644
 --- a/sc/Module_sc.mk
 +++ b/sc/Module_sc.mk
-@@ -53,12 +53,17 @@ endif
+@@ -34,8 +34,6 @@
+ 
+ $(eval $(call gb_Module_add_check_targets,sc,\
+ 	Library_scqahelper \
+-	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+-		CppunitTest_sc_ucalc) \
+ 	CppunitTest_sc_bugfix_test \
+ 	CppunitTest_sc_filters_test \
+ 	CppunitTest_sc_rangelst_test \
+@@ -53,12 +53,19 @@ endif
  $(eval $(call gb_Module_add_slowcheck_targets,sc, \
  	CppunitTest_sc_condformats \
  	CppunitTest_sc_new_cond_format_api \
@@ -25,6 +34,8 @@ index ef82147d781b..f737236d40c3 100644
  
 +ifeq ($(SYSTEM_CPPUNIT),TRUE)
 +$(eval $(call gb_Module_add_slowcheck_targets,sc, \
++	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
++		CppunitTest_sc_ucalc) \
 +	CppunitTest_sc_subsequent_filters_test \
 +))
 +endif
diff --git a/patches/series b/patches/series
index 3471358..1f29fcc 100644
--- a/patches/series
+++ b/patches/series
@@ -27,7 +27,7 @@ rsc-no-error-about-unknown-switch.diff
 no-packagekit-per-default.diff
 system-officeotron-and-odfvalidator.diff
 no-openssl.diff
-disable-sc_subsequent_filters_test-with-internal-cppunit.diff
+disable-some-sc-tests-with-internal-cppunit.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff

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