[libreoffice] 01/01: be consequent on checks disabling/ignoring failures

[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 2ca42e3f94db2b17c7146e7368aebbd0a8201c75
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jun 27 02:27:29 2017 +0200

    be consequent on checks disabling/ignoring failures
---
 changelog |  6 ++++++
 rules     | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 80cd598..a9d702e 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,12 @@ libreoffice (1:5.4.0~rc1-2) UNRELEASED; urgency=medium
     (Needs zip, python3-uno and libreoffice-officbean as new test Depends:)
   * debian/tests/sdk-examples: actually set -e...
 
+  * debian/rules:
+    - be consequent and set RUN_PYTESTS=n (and RUN_MAKE_UICHECK=n) where we set
+      RUN_MAKE_CHECK=n
+    - be consequent and add $(IGNORE_MAKE_CHECK_FAILURES) also to the "extra"
+      test runs
+
  -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 18:47:50 +0000
 
 libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
diff --git a/rules b/rules
index dbec757..e3dc0d8 100755
--- a/rules
+++ b/rules
@@ -312,16 +312,23 @@ ifeq "$(ENABLE_JAVA)" "y"
 #  endif
   ifneq (,$(findstring kfreebsd-amd64,$(DEB_HOST_ARCH)))
     export RUN_MAKE_CHECK=n
+    export RUN_MAKE_UICHECK=n
+    export RUN_PYTESTS=n
   endif
   ifneq (,$(findstring kfreebsd-i386,$(DEB_HOST_ARCH)))
     export RUN_MAKE_CHECK=n
+    export RUN_MAKE_UICHECK=n
+    export RUN_PYTESTS=n
   endif
   ifneq (,$(findstring sparc64,$(DEB_HOST_ARCH)))
     export RUN_MAKE_CHECK=n
+    export RUN_MAKE_UICHECK=n
+    export RUN_PYTESTS=n
   endif
 else
   RUN_MAKE_CHECK=n
   RUN_MAKE_UICHECK=n
+  RUN_PYTESTS=n
   ENABLE_JUNIT4=n
   ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -330,6 +337,7 @@ endif
 else
   RUN_MAKE_CHECK=n
   RUN_MAKE_UICHECK=n
+  RUN_PYTESTS=n
   ENABLE_JUNIT4=n
   ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -2075,14 +2083,16 @@ endif
 endif
 
 ifeq "$(RUN_PYTESTS)" "y"
-	cd $(SOURCE_TREE)/pyuno && $(MAKE) PythonTest_pytests
+	cd $(SOURCE_TREE)/pyuno && \
+		$(IGNORE_MAKE_CHECK_FAILURES)$(MAKE) PythonTest_pytests
 endif
 
 check-indep:
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	# since the gb_SUPPRESS_CHECK stuff in build this isn't checked.
 	# probably should, so do it here manually.
-	cd odk && $(MAKE) check
+	cd odk && \
+		$(IGNORE_MAKE_CHECK_FAILURES)$(MAKE) check
 endif
 
 install: $(STAMP_DIR)/install-common $(STAMP_DIR)/install-arch $(STAMP_DIR)/install-indep

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