[libreoffice] 01/01: uicheck-standalone.diff: set gb_UITest_SOFFICEARG to $(OOO_TEST_SOFFICE) directly

[Rene Engelhard]

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

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

commit 85832b91f6dbba6400e38af3af69afa8f7318f75
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Oct 18 17:03:43 2017 +0200

    uicheck-standalone.diff: set gb_UITest_SOFFICEARG to $(OOO_TEST_SOFFICE) directly
---
 tests/patches/uicheck-standalone.diff | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/patches/uicheck-standalone.diff b/tests/patches/uicheck-standalone.diff
index 119255d..9c04f57 100644
--- a/tests/patches/uicheck-standalone.diff
+++ b/tests/patches/uicheck-standalone.diff
@@ -1,8 +1,17 @@
 diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
-index 1edb3f769081..62d54917951b 100644
+index cebb030a12cd..88ec5499dcbd 100644
 --- a/solenv/gbuild/UITest.mk
 +++ b/solenv/gbuild/UITest.mk
-@@ -51,15 +54,15 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS)
+@@ -34,7 +34,7 @@ ifneq ($(gb_UITest_DEBUGRUN),)
+ gb_UITest_SOFFICEARG:=connect:pipe,name=$(USER)
+ gb_UITest__interactive := $(true)
+ else
+-gb_UITest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice
++gb_UITest_SOFFICEARG:=$(OOO_TEST_SOFFICE)
+ endif
+ 
+ gb_UITest_COMMAND := LIBO_LANG=en_US.UTF-8 $(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py
+@@ -65,8 +65,8 @@ else
  		$(DEFS) \
  		SAL_LOG_FILE="$(dir $(call gb_UITest_get_target,$*))/soffice.out.log" \
  		TEST_LIB=$(call gb_Library_get_target,test) \
@@ -13,14 +22,6 @@ index 1edb3f769081..62d54917951b 100644
  		TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*)))" \
  		PYTHONDONTWRITEBYTECODE=0 \
  		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
- 			SAL_USE_VCLPLUGIN=svp \
- 		)) \
- 		$(gb_UITest_COMMAND) \
--		--soffice="$(gb_UITest_SOFFICEARG)" \
-+		--soffice=$(OOO_TEST_SOFFICE) \
- 		--userdir=$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*))user) \
- 		--dir=$(strip $(MODULES)) \
- 		$(gb_UITest_GDBTRACE) \
 diff --git a/Makefile.in b/Makefile.in
 index 037cb5dce95b..f1b7c28e3c59 100644
 --- a/Makefile.in

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