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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Sat Mar 3 22:57:29 UTC 2012


    Date: Saturday, March 3, 2012 @ 22:57:28
  Author: vicho
Revision: 8262

Make mercurial be buildable twice in a row again in mips

r8240 (Increment the sleeps in the testsuite in mips so that the test
produces the same output than in faster architectures) broke rebuilds
in mips as it modifies the test source and doesn't restore it
afterwards.

Thanks Jakub Wilk for pointing this out.

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

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2012-03-03 11:01:17 UTC (rev 8261)
+++ packages/mercurial/trunk/debian/rules	2012-03-03 22:57:28 UTC (rev 8262)
@@ -27,11 +27,13 @@
 # hack by incrementing the sleep time in those slow
 # architectures.
 ifeq ($(DEB_HOST_ARCH),mips)
-		sed -i -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 $(CURDIR)/tests/test-pull-pull-corruption2.t
 endif
 
 	dh_auto_test -- TESTFLAGS="--timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
+	rename.ul .deb-backup '' $(CURDIR)/tests/*
+
 build-python%: mercurial/__version__.py
 	python$* setup.py build
 	touch $@




More information about the Python-apps-commits mailing list