[libreoffice] 01/01: backport also suppression of bridgetest

[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 854b6dbb4768717a0e7de2e3099ea54ba24f7c3e
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Jun 7 16:24:59 2017 +0200

    backport also suppression of bridgetest
---
 patches/gb_SUPPRESS_TESTS.diff | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/patches/gb_SUPPRESS_TESTS.diff b/patches/gb_SUPPRESS_TESTS.diff
index 221efbf..7c76cd5 100644
--- a/patches/gb_SUPPRESS_TESTS.diff
+++ b/patches/gb_SUPPRESS_TESTS.diff
@@ -136,3 +136,33 @@ index 05005be..0b11b36 100644
 -- 
 cgit v0.10.2
 
+From 35cd5805c3052a1190cf98c0d7dd320f83fd3c5e Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Tue, 6 Jun 2017 11:35:13 +0200
+Subject: One more test to suppress
+
+Change-Id: I8ba67cc1d34ce25fe174887ab6cbca85e7ce8658
+
+diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
+index 4b960e4..4850e5c 100644
+--- a/testtools/CustomTarget_uno_test.mk
++++ b/testtools/CustomTarget_uno_test.mk
+@@ -19,6 +19,9 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
+ 		$(call gb_Rdb_get_target,uno_services) \
+ 		$(call gb_Rdb_get_target,ure/services) \
+ 		$(call gb_UnoApi_get_target,udkapi)
++ifneq ($(gb_SUPPRESS_TESTS),)
++	@true
++else
+ 	$(call gb_Helper_abbreviate_dirs,\
+ 		$(call gb_Executable_get_command,uno) \
+ 		-s com.sun.star.test.bridge.BridgeTest \
+@@ -26,5 +29,6 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
+ 		-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD)) \
+ 		-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services)) \
+ 		-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb))
++endif
+ 
+ # vim:set shiftwidth=4 tabstop=4 noexpandtab:
+-- 
+cgit v0.10.2

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