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

[vicho at users.alioth.debian.org]

    Date: Saturday, March 3, 2012 @ 22:57:37
  Author: vicho
Revision: 8263

Add kfreebsd-i386 to the list of slow architectures

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-03-03 22:57:28 UTC (rev 8262)
+++ packages/mercurial/trunk/debian/changelog	2012-03-03 22:57:37 UTC (rev 8263)
@@ -1,3 +1,9 @@
+mercurial (2.1.1-2) UNRELEASED; urgency=low
+
+  * Add kfreebsd-i386 to the list of slow architectures for the test suite.
+
+ -- Javi Merino <vicho at debian.org>  Sat, 03 Mar 2012 13:48:03 +0000
+
 mercurial (2.1.1-1) unstable; urgency=low
 
   * New upstream version 2.1.1-1

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2012-03-03 22:57:28 UTC (rev 8262)
+++ packages/mercurial/trunk/debian/rules	2012-03-03 22:57:37 UTC (rev 8263)
@@ -17,6 +17,8 @@
          PARALLEL_TEST_JOBS := --jobs $(NJOBS)
 endif
 
+ARCH_IS_MIPS := $(if $(subst mips,,$(DEB_HOST_ARCH)),,T)
+ARCH_IS_KFREEBSD-i386 := $(if $(subst kfreebsd-i386,,$(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
@@ -25,8 +27,8 @@
 # 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 slow
-# architectures.
-ifeq ($(DEB_HOST_ARCH),mips)
+# architectures (mips and kfreebsd-i386 at the moment).
+ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386)),)
 		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t $(CURDIR)/tests/test-pull-pull-corruption2.t
 endif