From: Karel Zak <kzak@redhat.com>
Date: Wed, 9 Oct 2019 10:01:57 +0000 (+0200)
Subject: build-sys: support 'none' for parallel tests
X-Git-Tag: v2.35-rc1~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=571f5f5ba1eadc9fec48936f90cd23399a0638f7;p=thirdparty%2Futil-linux.git

build-sys: support 'none' for parallel tests

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/.travis-functions.sh b/.travis-functions.sh
index a608e3ac84..4cd145668c 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -93,7 +93,7 @@ function check_root
 	osx_prepare_check
 
 	# TS_OPTS= overwrites default from tests/Makemodule.am
-	sudo -E $MAKE check TS_PARALLEL=' ' TS_OPTS="$make_opts" || return
+	sudo -E $MAKE check "TS_PARALLEL=--parallel=none" TS_OPTS="$make_opts" || return
 
 	# root on osx has not enough permission for make install ;)
 	[ "$TRAVIS_OS_NAME" = "osx" ] && return
diff --git a/tests/run.sh b/tests/run.sh
index dfbb102435..1c3efdb6e9 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -93,7 +93,9 @@ while [ -n "$1" ]; do
 		;;
 	--parallel=*)
 		paraller_jobs="${1##--parallel=}"
-		if ! [ "$paraller_jobs" -ge 0 ] 2>/dev/null; then
+		if [ "$paraller_jobs" = "none" ]; then
+			paraller_jobs=1
+		elif ! [ "$paraller_jobs" -ge 0 ] 2>/dev/null; then
 			echo "invalid argument '$paraller_jobs' for --parallel="
 			exit 1
 		fi
@@ -121,7 +123,7 @@ while [ -n "$1" ]; do
 		echo "  --noskip-commands     fail on missing commands"
 		echo "  --srcdir=<path>       autotools top source directory"
 		echo "  --builddir=<path>     autotools top build directory"
-		echo "  --parallel=<num>      number of parallel test jobs, default: num cpus"
+		echo "  --parallel=<num|none> number of parallel test jobs, default: num cpus"
 		echo "  --exclude=<list>      exclude tests by list '<utilname>/<testname> ..'"
 		echo
 		exit 1