From 5917d17f0de803948f5be44e78fa6228013fb7ad Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Wed, 7 Mar 2018 20:12:02 +0100
Subject: travis: use parallel root checks

Also improve CPU count detection for tests.

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

(limited to 'tests/run.sh')

diff --git a/tests/run.sh b/tests/run.sh
index b32463e61..4c89b8c1e 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -27,8 +27,21 @@ paraller_jobs=1
 
 function num_cpus()
 {
-	if lscpu -p &>/dev/null; then
-		lscpu -p | grep -cv '^#'
+	local num
+
+	# coreutils
+	if num=$(nproc --all 2>/dev/null); then
+		:
+	# BSD, OSX
+	elif num=$(sysctl -n hw.ncpu 2>/dev/null); then
+		:
+	else
+		num=$(grep -c "^processor" /proc/cpuinfo 2>/dev/null)
+	fi
+
+	# translate garbage output to "1"
+	if test "$num" -gt "0" 2>/dev/null ;then
+		echo "$num"
 	else
 		echo 1
 	fi
-- 
cgit v1.2.3-55-g7522