From fc603d779567e400123b00f71b07c4b3da24687c Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Tue, 11 Aug 2015 00:55:38 +0200
Subject: [PATCH] Simplify the tests script

---
 tests/tests.sh | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/tests/tests.sh b/tests/tests.sh
index a9c5f1e..a1ab4e3 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -26,24 +26,12 @@ DATE="date"
 #fail
 _fail()
 {
-	test="$1"
-
-	shift
-	echo -n "$test:" 1>&2
-	(echo
-	echo "Testing: $OBJDIR$test" "$@"
-	LD_LIBRARY_PATH="$OBJDIR../src" "$OBJDIR$test" "$@") >> "$target" 2>&1
-	res=$?
-	if [ $res -ne 0 ]; then
-		echo " FAILED (error $res)" 1>&2
-	else
-		echo " PASS" 1>&2
-	fi
+	_run "$@"
 }
 
 
-#test
-_test()
+#run
+_run()
 {
 	test="$1"
 
@@ -54,13 +42,24 @@ _test()
 	LD_LIBRARY_PATH="$OBJDIR../src" "$OBJDIR$test" "$@") >> "$target" 2>&1
 	res=$?
 	if [ $res -ne 0 ]; then
-		echo " FAILED" 1>&2
-		FAILED="$FAILED $test(error $res)"
-		return 2
+		echo "Test: $test$sep$@: FAIL (error $res)"
+		echo " FAIL"
 	else
-		echo " PASS" 1>&2
-		return 0
+		echo "Test: $test$sep$@: PASS"
+		echo " PASS"
 	fi
+	return $res
+}
+
+
+#test
+_test()
+{
+	test="$1"
+
+	_run "$@"
+	res=$?
+	[ $res -eq 0 ] || FAILED="$FAILED $test(error $res)"
 }