Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH] Output uniform status message before and after src_test()
Date: Sat, 16 Aug 2014 22:22:03
Message-Id: 1408227736-14310-1-git-send-email-mgorny@gentoo.org
1 Before, the status message indicating src_test() run was output only if
2 the default EAPI implementation was used. If an ebuild overrode test
3 phase, the test phase output lacked delimitation. Instead, output
4 uniform status messages before and after running src_test() alike for
5 other phase functions.
6 ---
7 bin/phase-functions.sh | 4 ++++
8 bin/phase-helpers.sh | 4 ----
9 2 files changed, 4 insertions(+), 4 deletions(-)
10
11 diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
12 index f39a024..5795aac 100644
13 --- a/bin/phase-functions.sh
14 +++ b/bin/phase-functions.sh
15 @@ -489,7 +489,11 @@ __dyn_test() {
16 local save_sp=${SANDBOX_PREDICT}
17 addpredict /
18 __ebuild_phase pre_src_test
19 +
20 + __vecho ">>> Test phase: ${CATEGORY}/${PF}"
21 __ebuild_phase src_test
22 + __vecho ">>> Completed testing ${CATEGORY}/${PF}"
23 +
24 >> "$PORTAGE_BUILDDIR/.tested" || \
25 die "Failed to create $PORTAGE_BUILDDIR/.tested"
26 __ebuild_phase post_src_test
27 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
28 index 47bd843..1be550d 100644
29 --- a/bin/phase-helpers.sh
30 +++ b/bin/phase-helpers.sh
31 @@ -667,15 +667,11 @@ __eapi0_src_test() {
32 internal_opts+=" -j1"
33 fi
34 if $emake_cmd ${internal_opts} check -n &> /dev/null; then
35 - __vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
36 $emake_cmd ${internal_opts} check || \
37 die "Make check failed. See above for details."
38 elif $emake_cmd ${internal_opts} test -n &> /dev/null; then
39 - __vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
40 $emake_cmd ${internal_opts} test || \
41 die "Make test failed. See above for details."
42 - else
43 - __vecho ">>> Test phase [none]: ${CATEGORY}/${PF}"
44 fi
45 }
46
47 --
48 2.0.4

Replies