diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:40:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:40:10 +0000 |
| commit | c97b84f34167a573f3821258287c5acbe5e15593 (patch) | |
| tree | 449dd814ee4551b44afe26c9b386c6f607137c55 /bin/ebuild.sh | |
| parent | a82fc235ece39a45fa8c8db1419307225aa7b61f (diff) | |
| download | portage-c97b84f34167a573f3821258287c5acbe5e15593.tar.gz portage-c97b84f34167a573f3821258287c5acbe5e15593.tar.bz2 portage-c97b84f34167a573f3821258287c5acbe5e15593.zip | |
Only execute src_test pre/post hooks when src_test is actually executed.
(trunk r12809)
svn path=/main/branches/2.1.6/; revision=13041
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 8 |
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 } |