[libreoffice] 01/01: "make check on linux includes now uicheck"

[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 ce6dbf8450b85a58594ed733bdb02b0b4d2384c4
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 15 20:17:34 2017 +0200

    "make check on linux includes now uicheck"
---
 rules | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/rules b/rules
index 4b3fbf8..896bc62 100755
--- a/rules
+++ b/rules
@@ -264,7 +264,6 @@ ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "default"
     ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
         RUN_MAKE_CHECK=y
-        RUN_MAKE_UICHECK=y
         ifeq "$(DEB_HOST_ARCH)" "i386"
 	  ENABLE_JUNIT4=y
         endif
@@ -277,7 +276,6 @@ ifeq "$(ENABLE_JAVA)" "y"
   else
     ifeq "$(JDK)" "openjdk"
         RUN_MAKE_CHECK=y
-        RUN_MAKE_UICHECK=y
         ifeq "$(DEB_HOST_ARCH)" "i386"
 	  ENABLE_JUNIT4=y
         endif
@@ -288,7 +286,6 @@ ifeq "$(ENABLE_JAVA)" "y"
         ENABLE_EXPORT_VALIDATION_TESTS=n
     else
       RUN_MAKE_CHECK=n
-      RUN_MAKE_UICHECK=n
       ENABLE_JUNIT4=n
       RUN_PYTESTS=n
       ENABLE_CHART_TESTS=n
@@ -320,7 +317,6 @@ ifeq "$(ENABLE_JAVA)" "y"
   endif
 else
   RUN_MAKE_CHECK=n
-  RUN_MAKE_UICHECK=n
   ENABLE_JUNIT4=n
   ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -328,7 +324,6 @@ else
 endif
 else
   RUN_MAKE_CHECK=n
-  RUN_MAKE_UICHECK=n
   ENABLE_JUNIT4=n
   ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -2039,24 +2034,13 @@ endif
 		export TMPDIR=$$t; \
 		export HOME=$$t; \
 		export SAL_USE_VCLPLUGIN="svp"; \
-		unset DISPLAY; \
-		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
-		$(MAKE) -k check || PARALLELISM=1 $(MAKE) check && \
-	rm -rf $$t
-  ifeq "$(RUN_MAKE_UICHECK)" "y"
-	$(IGNORE_MAKE_CHECK_FAILURES)t=`mktemp -q -d`; \
-	cd $(SOURCE_TREE) && \
-		export PATH=$(BUILD_PATH); \
-		export TMPDIR=$$t; \
-		export HOME=$$t; \
-		export SAL_USE_VCLPLUGIN="svp"; \
 		export LOCPATH=$(CURDIR)/debian/locales; \
 		export LANG=en_US.UTF-8; \
 		export LC_ALL=en_US.UTF-8; \
+		unset DISPLAY; \
 		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
-		$(MAKE) -k uicheck || PARALLELISM=1 $(MAKE) uicheck && \
+		$(MAKE) -k check || PARALLELISM=1 $(MAKE) check && \
 	rm -rf $$t
-  endif
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
 	patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
 endif

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