travis: use parallel root checks

Also improve CPU count detection for tests.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/.travis-functions.sh b/.travis-functions.sh
index d92927e77abaf7fce3166dc5aaba8b166af789b6..1bf55662f8aa25a3322caf9fdd5bb9638c3b35fe 100755 (executable)
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -68,7 +68,7 @@ function check_nonroot
 
 function check_root
 {
-       local opts="$MAKE_CHECK_OPTS --parallel=1 --show-diff"
+       local opts="$MAKE_CHECK_OPTS --show-diff"
 
        xconfigure \
                --enable-all-programs \

diff --git a/tests/run.sh b/tests/run.sh
index b32463e615a23a29f636bc741fd60b32af1afd9e..4c89b8c1e19fc8753ab2138aba6daf8a0e2bb446 100755 (executable)
--- 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