From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-855865-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id F04FD1388BF
for <garchives@archives.gentoo.org>; Fri, 8 Jan 2016 05:15:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0DC42E0886;
Fri, 8 Jan 2016 05:15:02 +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 29E3121C003
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jan 2016 05:15:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 590FC340A1E
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jan 2016 05:15:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E63DED0D
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jan 2016 05:14:55 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1452230076.5844fcae98ccc4d28aa1709fe1783b4232dac6ff.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/tests/scons-utils.sh
X-VCS-Directories: eclass/tests/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 5844fcae98ccc4d28aa1709fe1783b4232dac6ff
X-VCS-Branch: master
Date: Fri, 8 Jan 2016 05:14:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 46dae41f-dff9-44b0-8893-a9b0209f565c
X-Archives-Hash: ea893ec18b6978865167c788283d9e03
commit: 5844fcae98ccc4d28aa1709fe1783b4232dac6ff
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 13:09:37 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 05:14:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5844fcae
scons-utils.eclass: tests, be more verbose on tests being performed
eclass/tests/scons-utils.sh | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh
index 5a65fbe..7387135 100755
--- a/eclass/tests/scons-utils.sh
+++ b/eclass/tests/scons-utils.sh
@@ -8,7 +8,9 @@ source tests-common.sh
inherit scons-utils
test-scons_clean_makeopts() {
- local sconsopts=$(scons_clean_makeopts ${1})
+ tbegin "scons_clean_makeopts() for ${1}"
+
+ local sconsopts=$(scons_clean_makeopts ${1}) ret=0
if [[ ${sconsopts} != ${2-${1}} ]]; then
eerror "Self-test failed:"
@@ -17,11 +19,11 @@ test-scons_clean_makeopts() {
eerror "Expected: ${2-${1}}"
eerror "Actual: ${sconsopts}"
eoutdent
- (( ++failed ))
- return 1
+ ret=1
fi
- return 0
+ tend ${ret}
+ return ${ret}
}
# jobcount expected for non-specified state
@@ -29,8 +31,6 @@ jc=5
# failed test counter
failed=0
-tbegin "scons_clean_makeopts()"
-
# sane MAKEOPTS
test-scons_clean_makeopts '--jobs=14 -k'
test-scons_clean_makeopts '--jobs=14 -k'
@@ -59,6 +59,4 @@ test-scons_clean_makeopts '--jobs funnystuff -k' "--jobs=${jc} -k"
test-scons_clean_makeopts '--jobs -l3' "--jobs=${jc}"
test-scons_clean_makeopts '-j -l3' "-j ${jc}"
-tend ${failed}
-
texit