[Python-modules-commits] r33941 - in packages/fedmsg/trunk/debian (rules)

[olasd at users.alioth.debian.org]

    Date: Friday, August 21, 2015 @ 11:54:37
  Author: olasd
Revision: 33941

Properly fix test running

Modified:
  packages/fedmsg/trunk/debian/rules

Modified: packages/fedmsg/trunk/debian/rules
===================================================================
--- packages/fedmsg/trunk/debian/rules	2015-08-21 11:41:08 UTC (rev 33940)
+++ packages/fedmsg/trunk/debian/rules	2015-08-21 11:54:37 UTC (rev 33941)
@@ -2,7 +2,6 @@
 
 UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
 
-
 %:
 	dh $@ --with python2,sphinxdoc,systemd --buildsystem=pybuild
 
@@ -27,12 +26,6 @@
 override_dh_install:
 	dh_install --fail-missing
 
-override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-	    PYBUILD_BEFORE_TEST="cp -r {dir}/fedmsg.d {build_dir}/fedmsg/tests/" \
-            PYBUILD_TEST_ARGS="{interpreter} setup.py test" \
-            dh_auto_test
-
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/_build/
@@ -41,6 +34,14 @@
 override_dh_installchangelogs:
 	dh_installchangelogs -k CHANGELOG.rst
 
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	cp -r fedmsg.d/ fedmsg/tests/
+	PYBUILD_SYSTEM=custom \
+	  PYBUILD_TEST_ARGS="{interpreter} setup.py test" \
+	  dh_auto_test
+endif
+
 get-orig-source:
 	git clone --bare git://github.com/fedora-infra/fedmsg.git fedmsg-orig.git
 	git --git-dir=fedmsg-orig.git archive $(shell echo $(UPSTREAM) | cut -d + -f 2  | cut -d . -f 3) | gzip > ../fedmsg_$(UPSTREAM).orig.tar.gz