[gentoo-commits] gentoo-projects commit in portage-utils/tests: init.sh

[Mike Frysinger (vapier)]

vapier      11/12/22 19:30:46

  Modified:             init.sh
  Log:
  redo test output to get info on a per-test basis

Revision  Changes    Path
1.7                  portage-utils/tests/init.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/init.sh?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/init.sh?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/init.sh?r1=1.6&r2=1.7

Index: init.sh
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/tests/init.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- init.sh	18 Dec 2011 06:49:06 -0000	1.6
+++ init.sh	22 Dec 2011 19:30:46 -0000	1.7
@@ -30,20 +30,40 @@
 
 q -i -q
 
-fail() {
-	echo "${BAD}FAILED:${NORMAL} $*"
-	exit 1
+tret=0
+tpassed=0
+tfailed=0
+
+tfail() {
+	echo "${BAD}FAIL:${NORMAL} $*"
+	: $(( ++tfailed ))
+	tret=1
+	return 1
+}
+tpass() {
+	echo "${GOOD}PASS:${NORMAL} $*"
+	: $(( ++tpassed ))
+	return 0
+}
+tend() {
+	local r=$1; shift
+	[[ $r -eq 0 ]] && tpass "$@" || tfail "$@"
+	return $r
+}
+
+die() {
+	tfail "$@"
+	end
 }
-die() { fail "$@" ; }
 
 skip() {
 	echo "${WARN}SKIPPED:${NORMAL} $*"
 	exit 0
 }
 
-pass() {
-	echo "${GOOD}PASSED:${NORMAL} ${PWD##*/}"
-	exit 0
+end() {
+	echo "${HILITE}${PWD##*/}:${NORMAL} ${tpassed} passes / ${tfailed} fails"
+	exit ${tret}
 }
 
 mktmpdir() {