[Python-apps-commits] r8847 - in packages/mercurial/trunk/debian (changelog rules)

[vicho at users.alioth.debian.org]

    Date: Wednesday, June 6, 2012 @ 22:35:10
  Author: vicho
Revision: 8847

Don't run the testsuite if nocheck is in DEB_BUILD_OPTION

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/rules	(contents, properties)

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-06-06 13:40:40 UTC (rev 8846)
+++ packages/mercurial/trunk/debian/changelog	2012-06-06 22:35:10 UTC (rev 8847)
@@ -1,3 +1,9 @@
+mercurial (2.2.2-2) UNRELEASED; urgency=low
+
+  * Don't run the testsuite if nocheck is in DEB_BUILD_OPTIONS
+
+ -- Javi Merino <vicho at debian.org>  Tue, 05 Jun 2012 10:15:40 +0100
+
 mercurial (2.2.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2012-06-06 13:40:40 UTC (rev 8846)
+++ packages/mercurial/trunk/debian/rules	2012-06-06 22:35:10 UTC (rev 8847)
@@ -23,6 +23,7 @@
 ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 # test-pull-pull-corruption tries to execute two hg commands at the
 # same time to test for corruption.  It does so by running an hg
 # command in the background, sleeping one second and running the
@@ -37,6 +38,7 @@
 	dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
 	rename.ul .deb-backup '' $(CURDIR)/tests/*
+endif
 
 build-python%: mercurial/__version__.py
 	python$* setup.py build