commit: 0e6e3a57a8de9287892f2a67cd37632b43754aee
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 4 14:06:06 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 4 14:48:23 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qa-scripts.git;a=commit;h=0e6e3a57
tinderbox: return the exit status of the make function override.
This ensure that tests are correctly detected as passed/failed by
portage.
Also, calling /usr/bin/make instead of emake should more
accurately replicate the behaviour intended by the original
function call.
---
tinderbox/bashrc | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tinderbox/bashrc b/tinderbox/bashrc
index 763979c..47bb19e 100644
--- a/tinderbox/bashrc
+++ b/tinderbox/bashrc
@@ -140,17 +140,16 @@ tinderbox_log() {
#
make() {
- if [[ "${FUNCNAME[1]}" == "einstall" ]] ; then
- emake -j1 "$@"
+ if [[ "${FUNCNAME[1]}" == "einstall" || "${FUNCNAME[1]}" ==
"__eapi0_src_test" ]] ; then
+ /usr/bin/make -j1 "$@"
+ ret=$?
else
emake "$@"
-
- if [[ "${FUNCNAME[1]}" == "__eapi0_src_test" ]] ; then
- return
- fi
-
+ ret=$?
eqawarn QA Notice: direct 'make' call by ${FUNCNAME[1]}
fi
+
+ return ${ret}
}
#
