From c97b84f34167a573f3821258287c5acbe5e15593 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 07:40:10 +0000 Subject: Only execute src_test pre/post hooks when src_test is actually executed. (trunk r12809) svn path=/main/branches/2.1.6/; revision=13041 --- bin/ebuild.sh | 8 ++++---- 1 file 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 } -- cgit v1.2.3-1-g7c22