[libreoffice] 01/01: run make check in odk for build-indep (since it's not included in main make check

Rene Engelhard rene at moszumanska.debian.org
Sun Jun 25 21:25:06 UTC 2017


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 dceb975d5cd904fcefce3c598ced134c0cacbc6d
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Jun 25 23:18:07 2017 +0200

    run make check in odk for build-indep (since it's not included in main make check
---
 rules | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/rules b/rules
index 38a96fa..f6d088f 100755
--- a/rules
+++ b/rules
@@ -2002,8 +2002,13 @@ ifeq "$(BUILD_TEST_PACKAGE)" "y"
   endif
 endif
 
+ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	$(CURDIR)/debian/rules check-indep
+endif
+
 	touch $@
 
+
 check: 
 ifeq "$(RUN_MAKE_CHECK)" "y"
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@ -2073,6 +2078,13 @@ ifeq "$(RUN_PYTESTS)" "y"
 	cd $(SOURCE_TREE)/pyuno && $(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
+endif
+
 install: $(STAMP_DIR)/install-common $(STAMP_DIR)/install-arch $(STAMP_DIR)/install-indep
 
 install-common: $(STAMP_DIR)/install-common

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



More information about the Pkg-openoffice-commits mailing list