Fix test runs for dev-util/mercurial (bug 297964).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 17 insertions, 13 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 0470aa1b9794..c0cae9a5c530 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/mercurial
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.112 2009/12/02 08:30:40 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.113 2009/12/24 13:38:18 djc Exp $
+
+  24 Dec 2009; Dirkjan Ochtman <djc@gentoo.org> mercurial-1.3.1-r1.ebuild,
+  mercurial-1.4.ebuild, mercurial-1.4.1.ebuild, mercurial-9999.ebuild:
+  Fix test runs failing for existent test dir (bug 297964).
 
 *mercurial-1.4.1 (02 Dec 2009)
 
diff --git a/dev-util/mercurial/mercurial-1.3.1-r1.ebuild b/dev-util/mercurial/mercurial-1.3.1-r1.ebuild
index 85e0a515b7b4..c9e775165f1c 100644
--- a/dev-util/mercurial/mercurial-1.3.1-r1.ebuild
+++ b/dev-util/mercurial/mercurial-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.3.1-r1.ebuild,v 1.6 2009/11/03 19:20:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.3.1-r1.ebuild,v 1.7 2009/12/24 13:38:18 djc Exp $
 
 EAPI=2
 
@@ -78,8 +78,6 @@ EOF
 }
 
 src_test() {
-	local testdir="${T}/tests"
-	mkdir -p -m1777 "${testdir}" || die
 	cd "${S}/tests/"
 	rm -rf *svn*				# Subversion tests fail with 1.5
 	rm -f test-archive			# Fails due to verbose tar output changes
@@ -98,6 +96,8 @@ src_test() {
 		rm -f test-permissions		# Test is broken when run as root
 		rm -f test-pull-permission	# Test is broken when run as root
 	fi
+	local testdir="${T}/tests"
+	rm -rf "${testdir}"
 	einfo "Running Mercurial tests ..."
 	python run-tests.py --tmpdir="${testdir}" || die "test failed"
 }
diff --git a/dev-util/mercurial/mercurial-1.4.1.ebuild b/dev-util/mercurial/mercurial-1.4.1.ebuild
index 8a8ceb1e09cb..addc323aa829 100644
--- a/dev-util/mercurial/mercurial-1.4.1.ebuild
+++ b/dev-util/mercurial/mercurial-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.4.1.ebuild,v 1.1 2009/12/02 08:30:40 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.4.1.ebuild,v 1.2 2009/12/24 13:38:18 djc Exp $
 
 EAPI=2
 
@@ -77,8 +77,6 @@ EOF
 }
 
 src_test() {
-	local testdir="${T}/tests"
-	mkdir -p -m1777 "${testdir}" || die
 	cd "${S}/tests/"
 	rm -rf *svn*				# Subversion tests fail with 1.5
 	rm -f test-archive			# Fails due to verbose tar output changes
@@ -97,6 +95,8 @@ src_test() {
 		rm -f test-permissions		# Test is broken when run as root
 		rm -f test-pull-permission	# Test is broken when run as root
 	fi
+	local testdir="${T}/tests"
+	rm -rf "${testdir}"
 	einfo "Running Mercurial tests ..."
 	python run-tests.py --tmpdir="${testdir}" || die "test failed"
 }
diff --git a/dev-util/mercurial/mercurial-1.4.ebuild b/dev-util/mercurial/mercurial-1.4.ebuild
index 82698e2fe675..f12810ce7f3e 100644
--- a/dev-util/mercurial/mercurial-1.4.ebuild
+++ b/dev-util/mercurial/mercurial-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.4.ebuild,v 1.1 2009/11/16 21:23:10 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.4.ebuild,v 1.2 2009/12/24 13:38:18 djc Exp $
 
 EAPI=2
 
@@ -77,8 +77,6 @@ EOF
 }
 
 src_test() {
-	local testdir="${T}/tests"
-	mkdir -p -m1777 "${testdir}" || die
 	cd "${S}/tests/"
 	rm -rf *svn*				# Subversion tests fail with 1.5
 	rm -f test-archive			# Fails due to verbose tar output changes
@@ -97,6 +95,8 @@ src_test() {
 		rm -f test-permissions		# Test is broken when run as root
 		rm -f test-pull-permission	# Test is broken when run as root
 	fi
+	local testdir="${T}/tests"
+	rm -rf "${testdir}"
 	einfo "Running Mercurial tests ..."
 	python run-tests.py --tmpdir="${testdir}" || die "test failed"
 }
diff --git a/dev-util/mercurial/mercurial-9999.ebuild b/dev-util/mercurial/mercurial-9999.ebuild
index 6d9532a1c029..df8c3d8df0c6 100644
--- a/dev-util/mercurial/mercurial-9999.ebuild
+++ b/dev-util/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-9999.ebuild,v 1.3 2009/07/25 10:38:45 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-9999.ebuild,v 1.4 2009/12/24 13:38:18 djc Exp $
 
 inherit bash-completion elisp-common flag-o-matic eutils distutils mercurial
 
@@ -77,8 +77,6 @@ EOF
 }
 
 src_test() {
-	local testdir="${T}/tests"
-	mkdir -p -m1777 "${testdir}" || die
 	cd "${S}/tests/"
 	rm -f *svn*		# Subversion tests fail with 1.5
 	rm -f test-convert-baz*		# GNU Arch baz
@@ -96,6 +94,8 @@ src_test() {
 		rm -f test-permissions		# Test is broken when run as root
 		rm -f test-pull-permission	# Test is broken when run as root
 	fi
+	local testdir="${T}/tests"
+	rm -rf "${testdir}"
 	einfo "Running Mercurial tests ..."
 	python run-tests.py --tmpdir="${testdir}" || die "test failed"
 }