diff options
author | Michael Palimaka <kensington@gentoo.org> | 2014-06-05 00:06:06 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2014-06-05 00:48:23 +1000 |
commit | 0e6e3a57a8de9287892f2a67cd37632b43754aee (patch) | |
tree | 223bb647adf5c79119ef20eee4a979371882a9b3 /tinderbox | |
parent | tinderbox: Initial commit adding portage bashrc. (diff) | |
download | qa-scripts-0e6e3a57a8de9287892f2a67cd37632b43754aee.tar.gz qa-scripts-0e6e3a57a8de9287892f2a67cd37632b43754aee.tar.bz2 qa-scripts-0e6e3a57a8de9287892f2a67cd37632b43754aee.zip |
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.
Diffstat (limited to 'tinderbox')
-rw-r--r-- | tinderbox/bashrc | 13 |
1 files 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} } # |