From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7CB0C1381FA for ; Wed, 4 Jun 2014 14:56:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46628E0986; Wed, 4 Jun 2014 14:56:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 848AFE0982 for ; Wed, 4 Jun 2014 14:56:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5207C33FD38 for ; Wed, 4 Jun 2014 14:55:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id ECC22181A9 for ; Wed, 4 Jun 2014 14:55:57 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1401893303.0e6e3a57a8de9287892f2a67cd37632b43754aee.kensington@gentoo> Subject: [gentoo-commits] proj/qa-scripts:master commit in: tinderbox/ X-VCS-Repository: proj/qa-scripts X-VCS-Files: tinderbox/bashrc X-VCS-Directories: tinderbox/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 0e6e3a57a8de9287892f2a67cd37632b43754aee X-VCS-Branch: master Date: Wed, 4 Jun 2014 14:55:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 742cff7a-6e57-4b24-a22c-0621cf7b4931 X-Archives-Hash: e9047e52d9ad5be85dcea4f95c679268 commit: 0e6e3a57a8de9287892f2a67cd37632b43754aee Author: Michael Palimaka gentoo org> AuthorDate: Wed Jun 4 14:06:06 2014 +0000 Commit: Michael Palimaka gentoo 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} } #