diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-08-16 23:55:19 +0200 |
|---|---|---|
| committer |   Brian Dolbec <dolsen@gentoo.org> | 2014-09-11 16:44:25 -0700 |
| commit | f219582624a2b0d32a235fa438c26ec492cceb80 (patch) | |
| tree | 433325161688f9a49cf20ea3782cdac6d4e89d47 /bin | |
| parent | Fix read only detection logic (diff) | |
| download | portage-f219582624a2b0d32a235fa438c26ec492cceb80.tar.gz portage-f219582624a2b0d32a235fa438c26ec492cceb80.tar.bz2 portage-f219582624a2b0d32a235fa438c26ec492cceb80.zip | |
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.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/phase-functions.sh | 4 | ||||
| -rw-r--r-- | 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 e80f16e7f..df385b841 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 47bd843c6..02fcf3e1a 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 } |