From 0e6e3a57a8de9287892f2a67cd37632b43754aee Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 5 Jun 2014 00:06:06 +1000
Subject: 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(-)

(limited to 'tinderbox/bashrc')

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}
 }
 
 #
-- 
cgit v1.2.3