[libreoffice] 02/02: debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress

[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 a13b9b43a577b822784b462d4073852bee94f2cd
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Jun 9 21:35:16 2017 +0200

    debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
---
 changelog                      |  2 ++
 patches/gb_SUPPRESS_TESTS.diff | 76 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/changelog b/changelog
index 6f3eef5..4c3ef50 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,7 @@
 libreoffice (1:5.4.0~beta2-4) UNRELEASED; urgency=medium
 
+  * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
+    (from master)
   * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
     JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
 
diff --git a/patches/gb_SUPPRESS_TESTS.diff b/patches/gb_SUPPRESS_TESTS.diff
index 7c76cd5..78b318b 100644
--- a/patches/gb_SUPPRESS_TESTS.diff
+++ b/patches/gb_SUPPRESS_TESTS.diff
@@ -166,3 +166,79 @@ index 4b960e4..4850e5c 100644
  # vim:set shiftwidth=4 tabstop=4 noexpandtab:
 -- 
 cgit v0.10.2
+From 3de594d3347ead24f3211714f0e0010c1434cdf2 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 9 Jun 2017 17:24:55 +0200
+Subject: More tests to suppress (all .PHONY test targets should be covered
+ now)
+
+Change-Id: Ib948547e5c177ac62506fc42a564368a8d31fa4e
+
+diff --git a/idlc/CustomTarget_parser_test.mk b/idlc/CustomTarget_parser_test.mk
+index 84b01d9..0c9d15e 100644
+--- a/idlc/CustomTarget_parser_test.mk
++++ b/idlc/CustomTarget_parser_test.mk
+@@ -25,6 +25,9 @@ $(call gb_CustomTarget_get_target,idlc/parser_test) : \
+             $(SRCDIR)/idlc/test/parser/struct.tests \
+             $(SRCDIR)/idlc/test/parser/typedef.tests \
+             | $(call gb_CustomTarget_get_workdir,idlc/parser_test)/.dir
++ifneq ($(gb_SUPPRESS_TESTS),)
++	@true
++else
+ 	$(call gb_Helper_abbreviate_dirs,( \
+             $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
+                 $(SRCDIR)/idlc/test/parser/attribute.tests \
+@@ -77,5 +80,6 @@ $(call gb_CustomTarget_get_target,idlc/parser_test) : \
+                 $(call gb_Executable_get_command,idlc) \
+                 -O $(call gb_CustomTarget_get_workdir,idlc/parser_test) {}) \
+             > $@.log 2>&1 || (cat $@.log && false))
++endif
+ 
+ # vim: set noet sw=4 ts=4:
+diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
+index 89e4273..81ac3a1 100644
+--- a/odk/CustomTarget_build-examples.mk
++++ b/odk/CustomTarget_build-examples.mk
+@@ -89,6 +89,9 @@ endif
+ 
+ $(call gb_CustomTarget_get_target,odk/build-examples): \
+         $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv
++ifneq ($(gb_SUPPRESS_TESTS),)
++	@true
++else
+ 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
+ 	(saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \
+         $(if $(filter MACOSX,$(OS)),, \
+@@ -102,6 +105,7 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
+         || (RET=$$? \
+             && cat $(call gb_CustomTarget_get_workdir,odk/build-examples)/log \
+             && exit $$RET)
++endif
+ 
+ $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
+         $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \
+diff --git a/registry/CustomTarget_regcompare_test.mk b/registry/CustomTarget_regcompare_test.mk
+index efdc070..e781630 100644
+--- a/registry/CustomTarget_regcompare_test.mk
++++ b/registry/CustomTarget_regcompare_test.mk
+@@ -31,6 +31,9 @@ $(call gb_CustomTarget_get_target,registry/regcompare_test): \
+         $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
+         $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
+         $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb
++ifneq ($(gb_SUPPRESS_TESTS),)
++	@true
++else
+ 	$(call gb_Helper_abbreviate_dirs,( \
+         $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
+@@ -191,6 +194,7 @@ $(call gb_CustomTarget_get_target,registry/regcompare_test): \
+             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
+             -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
+         > $@.log 2>&1 || (cat $@.log && false))
++endif
+ 
+ $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.rdb: \
+         $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.urd \
+-- 
+cgit v0.10.2
+

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