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

[vicho at users.alioth.debian.org]

    Date: Wednesday, May 2, 2012 @ 18:22:30
  Author: vicho
Revision: 8585

Don't patch test-pull-pull-corruption2.t in kfreebsd-i386, armel, sparc or mips, it's now integrated into test-pull-pull-corruption.t

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-05-02 17:33:55 UTC (rev 8584)
+++ packages/mercurial/trunk/debian/changelog	2012-05-02 18:22:30 UTC (rev 8585)
@@ -1,3 +1,10 @@
+mercurial (2.2-2) unstable; urgency=low
+
+  * Don't patch test-pull-pull-corruption2.t in kfreebsd-i386, armel,
+    sparc or mips, it's now integrated into test-pull-pull-corruption.t
+
+ -- Javi Merino <vicho at debian.org>  Wed, 02 May 2012 19:21:40 +0100
+
 mercurial (2.2-1) unstable; urgency=low
 
   * New upstream release 2.2

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2012-05-02 17:33:55 UTC (rev 8584)
+++ packages/mercurial/trunk/debian/rules	2012-05-02 18:22:30 UTC (rev 8585)
@@ -23,15 +23,15 @@
 ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
 
 override_dh_auto_test:
-# Some tests try to execute two hg commands at the same time to test
-# for corruption.  They do so by running an hg command in the
-# background, sleeping one second and running the second command.  In
-# architectures with slow buildds, one second is not enough and the
-# second test starts before the first one has started printing.  This
-# is hacky and we just enhance the hack by incrementing the sleep time
-# in those architectures.
+# 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
+# second command.  In architectures with slow buildds, one second is
+# not enough and the second test starts before the first one has
+# started printing.  This is hacky and we just enhance the hack by
+# incrementing the sleep time in those architectures.
 ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),)
-		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t $(CURDIR)/tests/test-pull-pull-corruption2.t
+		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
 endif
 
 	dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"