[libreoffice] 01/02: "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-5.5
in repository libreoffice.

commit bb9235a4f1edb12080ccdc2530a8d0a1167d7014
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jun 6 23:33:47 2017 +0200

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

diff --git a/changelog b/changelog
index 3b4d17b..9f8d07b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.5.0~alpha0~git20170605-1) UNRELEASED; urgency=medium
+libreoffice (1:5.5.0~alpha0~git20170606-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/rules b/rules
index e0063ac..fafb656 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,21 +2034,10 @@ endif
 		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 LANG=C.UTF-8; \
 		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