summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-09 21:47:14 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-09 21:47:14 +0000
commit48bb94e58ee1f80f7f83d0216348951326b2e385 (patch)
tree23cf6db547c05adf17ebd38fc1c801c183e0ee7a
parent14efc18eb873f6ec0002c41d7a772b26f132f1b3 (diff)
downloadportage-48bb94e58ee1f80f7f83d0216348951326b2e385.tar.gz
portage-48bb94e58ee1f80f7f83d0216348951326b2e385.tar.bz2
portage-48bb94e58ee1f80f7f83d0216348951326b2e385.zip
Only execute src_test pre/post hooks when src_test is actually executed.
svn path=/main/trunk/; revision=12809
-rwxr-xr-xbin/ebuild.sh8
1 files changed, 4 insertions, 4 deletions
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
}