[Pkg-mongodb-maintainers] [pkg-mongodb] 367/394: fixup! d/rules: honour nocheck build option

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit c94f8cbcd8341336d4b2d828f1dd7f3cafa3d2cb
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Feb 10 23:47:39 2016 +0200

    fixup! d/rules: honour nocheck build option
---
 debian/rules | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index ba0ce00..6a1c3ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,14 +32,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(no_v8_archs)))
 COMMON_OPTIONS += --disable-scripting
 endif
 
-DEB_SCONS_CLEAN = . --keep-going --clean $(COMMON_OPTIONS)
-DEB_SCONS_BUILD = all $(COMMON_OPTIONS)
-DEB_SCONS_CHECK = --smokedbprefix=$(CURDIR)/debian/tmp-test smoke \
-  $(COMMON_OPTIONS)
-DEB_SCONS_INSTALL = --prefix=$(CURDIR)/debian/tmp/usr install $(COMMON_OPTIONS)
-
 override_dh_clean:
-	scons $(DEB_SCONS_CLEAN)
+	scons --keep-going --clean $(COMMON_OPTIONS) .
 	find $(CURDIR)/ -name "*.pyc" -delete
 	rm -rf $(CURDIR)/debian/tmp-test/
 	rm -rf $(CURDIR)/.scons/
@@ -48,15 +42,18 @@ override_dh_clean:
 	dh_clean
 
 override_dh_auto_build:
-	scons $(DEB_SCONS_BUILD)
+	scons $(COMMON_OPTIONS) core tools
 
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	scons $(DEB_SCONS_CHECK)
+	scons $(COMMON_OPTIONS) \
+		--smokedbprefix=$(CURDIR)/debian/tmp-test \
+		test unittests moduletests smoke
+.PHONY: override_dh_auto_test
 endif
 
 override_dh_auto_install:
-	scons $(DEB_SCONS_INSTALL)
+	scons $(COMMON_OPTIONS) --prefix=$(CURDIR)/debian/tmp/usr install
 
 override_dh_systemd_enable:
 	dh_systemd_enable -pmongodb-server --name=mongodb
@@ -75,6 +72,6 @@ endif
 %:
 	dh $@ --parallel --with=systemd
 
-.PHONY: override_dh_clean override_dh_auto_build override_dh_auto_test \
+.PHONY: override_dh_clean override_dh_auto_build \
 	override_dh_auto_install override_dh_installinit \
 	override_dh_systemd_enable override_dh_install

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