[gentoo-commits] proj/portage:master commit in: bin/

[Brian Dolbec]

commit:     f219582624a2b0d32a235fa438c26ec492cceb80
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 16 21:55:19 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Sep 11 23:44:25 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f2195826

Output uniform status message before and after src_test()

Output the status messages before and after running src_test()
unconditionally, alike it is done for other src_* phase functions,
rather than in EAPI-default src_test() function. This fixes the issue of
test phase output lacking delimitation whenever a custom src_test()
function was used.

---
 bin/phase-functions.sh | 4 ++++
 bin/phase-helpers.sh   | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index e80f16e..df385b8 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -499,7 +499,11 @@ __dyn_test() {
                local save_sp=${SANDBOX_PREDICT}
                addpredict /
                __ebuild_phase pre_src_test
+
+               __vecho ">>> Test phase: ${CATEGORY}/${PF}"
                __ebuild_phase src_test
+               __vecho ">>> Completed testing ${CATEGORY}/${PF}"
+
                >> "$PORTAGE_BUILDDIR/.tested" || \
                        die "Failed to create $PORTAGE_BUILDDIR/.tested"
                __ebuild_phase post_src_test

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 47bd843..02fcf3e 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -667,15 +667,13 @@ __eapi0_src_test() {
                internal_opts+=" -j1"
        fi
        if $emake_cmd ${internal_opts} check -n &> /dev/null; then
-               __vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+               __vecho "${emake_cmd} ${internal_opts} check" >&2
                $emake_cmd ${internal_opts} check || \
                        die "Make check failed. See above for details."
        elif $emake_cmd ${internal_opts} test -n &> /dev/null; then
-               __vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
+               __vecho "${emake_cmd} ${internal_opts} test" >&2
                $emake_cmd ${internal_opts} test || \
                        die "Make test failed. See above for details."
-       else
-               __vecho ">>> Test phase [none]: ${CATEGORY}/${PF}"
        fi
 }