[libreoffice] 01/01: fix uicheck without needing 'build', actually set OOO_TEST_SOFFICE

[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 fa4e73e0d17fe0ca45a5cac3747d8a95ed3ae263
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 3 08:20:14 2017 +0200

    fix uicheck without needing 'build', actually set OOO_TEST_SOFFICE
---
 tests/.uicheck.swp                    | Bin 0 -> 12288 bytes
 tests/control                         |   1 -
 tests/patches/uicheck-standalone.diff |  36 +++++++++++++++++++++++++++++++++-
 tests/uicheck                         |   1 +
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/tests/.uicheck.swp b/tests/.uicheck.swp
new file mode 100644
index 0000000..24a0b56
Binary files /dev/null and b/tests/.uicheck.swp differ
diff --git a/tests/control b/tests/control
index c8cfeb3..3e498df 100644
--- a/tests/control
+++ b/tests/control
@@ -6,7 +6,6 @@ Depends: python3-uno
 
 Tests: uicheck
 Depends: @builddeps@, libreoffice, python3-uno, locales
-Restrictions: build-needed
 
 Tests: sdk-examples
 Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk, python3-uno, libreoffice-officebean, zip
diff --git a/tests/patches/uicheck-standalone.diff b/tests/patches/uicheck-standalone.diff
index 1f7463c..8d6374b 100644
--- a/tests/patches/uicheck-standalone.diff
+++ b/tests/patches/uicheck-standalone.diff
@@ -9,7 +9,7 @@ index 1edb3f769081..62d54917951b 100644
 -		URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \
 -		PYTHONPATH="$(PYPATH)" \
 +		URE_BOOTSTRAP=vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc \
-+		PYTHONPATH="$(filter-out $I/program,$(PYPATH))" \
++		PYTHONPATH="$(filter-out $I/program,$(PYPATH):/usr/lib/libreoffice/program)" \
  		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),, \
@@ -33,3 +33,37 @@ index 037cb5dce95b..f1b7c28e3c59 100644
   $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
   $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS))
  
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index 4073dcfd9bf5..856f5efee988 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -201,7 +201,7 @@ perfcheck :
+ 	$(call gb_Output_announce_title,all perftests checked.)
+ 	$(call gb_Output_announce_bell)
+ 
+-uicheck : build
++uicheck :
+ 	$(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),UIT,6))
+ 	$(call gb_Output_announce_title,all uicheck checked.)
+ 	$(call gb_Output_announce_bell)
+@@ -372,11 +372,6 @@ define gb_Module_add_uicheck_target
+ $(call gb_Module__read_targetfile,$(1),$(2),uicheck target)
+ 
+ $(call gb_Module_get_uicheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
+-$$(gb_Module_CURRENTTARGET) :| \
+-	$(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
+-    $(call gb_Package_get_target,instsetoo_native_setup) \
+-    $(call gb_Package_get_target,instsetoo_native_setup_ure)
+-$(call gb_Module_get_uicheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
+ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
+ 
+ endef
+@@ -479,7 +474,7 @@ endif
+ subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
+ stagingcheck : $$(firstword $$(gb_Module_STAGINGCHECKTARGETSTACK))
+ perfcheck : $$(firstword $$(gb_Module_PERFCHECKTARGETSTACK))
+-uicheck : build $$(firstword $$(gb_Module_UICHECKTARGETSTACK))
++uicheck : $$(firstword $$(gb_Module_UICHECKTARGETSTACK))
+ clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
+ 
+ ifneq ($$(words $$(gb_Module_TARGETSTACK)),1)
diff --git a/tests/uicheck b/tests/uicheck
index edcc17c..5b123bc 100755
--- a/tests/uicheck
+++ b/tests/uicheck
@@ -48,4 +48,5 @@ export LOCPATH=$WORKDIR/debian/locales
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 make -rk \
+    OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
     uicheck verbose=t 2>&1

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