From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Mar 2009 21:47:14 +0000 (-0000)
Subject: Only execute src_test pre/post hooks when src_test is actually executed.
X-Git-Tag: v2.2_rc24~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48bb94e58ee1f80f7f83d0216348951326b2e385;p=portage.git

Only execute src_test pre/post hooks when src_test is actually executed.

svn path=/main/trunk/; revision=12809
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 09bc8f960..9d3428349 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -933,7 +933,6 @@ dyn_test() {
 		# like it's supposed to here.
 		! hasq test ${USE} && export USE="${USE} test"
 	fi
-	ebuild_phase pre_src_test
 	if [[ -e $PORTAGE_BUILDDIR/.tested ]] ; then
 		vecho ">>> It appears that ${PN} has already been tested; skipping."
 		return
@@ -951,13 +950,14 @@ dyn_test() {
 		vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
 	else
 		addpredict /
+		ebuild_phase pre_src_test
 		ebuild_phase src_test
+		touch "$PORTAGE_BUILDDIR/.tested" || \
+			die "Failed to 'touch .tested' in $PORTAGE_BUILDDIR"
+		ebuild_phase post_src_test
 		SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
 	fi
 
-	touch "$PORTAGE_BUILDDIR/.tested" || \
-		die "Failed to 'touch .tested' in $PORTAGE_BUILDDIR"
-	ebuild_phase post_src_test
 	trap - SIGINT SIGQUIT
 }