From 07b1ea7c44a38d5df504524a5279de06220903b5 Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Fri, 9 Mar 2018 13:04:41 +0100
Subject: tests: handle xargs errors and invalid args

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/run.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'tests/run.sh')

diff --git a/tests/run.sh b/tests/run.sh
index 4c89b8c1e..f40c9f801 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -82,6 +82,10 @@ while [ -n "$1" ]; do
 		;;
 	--parallel=*)
 		paraller_jobs="${1##--parallel=}"
+		if ! [ "$paraller_jobs" -ge 0 2>/dev/null ]; then
+			echo "invalid argument '$paraller_jobs' for --parallel="
+			exit 1
+		fi
 		;;
 	--parallel)
 		paraller_jobs=$(num_cpus)
@@ -184,8 +188,10 @@ printf "%13s: %-30s    " "kernel" "$(uname -r)"
 echo
 echo
 
-if [ $paraller_jobs -gt 1 ]; then
-	echo "              Executing the tests in parallel ($paraller_jobs jobs)    "
+if [ "$paraller_jobs" -ne 1 ]; then
+	tmp=$paraller_jobs
+	[ "$paraller_jobs" -eq 0 ] && tmp=infinite
+	echo "              Executing the tests in parallel ($tmp jobs)    "
 	echo
 	OPTS="$OPTS --parallel"
 fi
@@ -196,6 +202,10 @@ printf "%s\n" ${comps[*]} |
 	sort |
 	xargs -I '{}' -P $paraller_jobs -n 1 bash -c "'{}' \"$OPTS\" ||
 		echo 1 >> $top_builddir/tests/failures"
+if [ $? != 0 ]; then
+	echo "xargs error" >&2
+	exit 1
+fi
 declare -a fail_file
 fail_file=( $( < $top_builddir/tests/failures ) ) || exit 1
 rm -f $top_builddir/tests/failures
-- 
cgit v1.2.3-55-g7522