diff options
| -rwxr-xr-x | .travis-functions.sh | 2 | ||||
| -rwxr-xr-x | tests/run.sh | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/.travis-functions.sh b/.travis-functions.sh index d92927e77..1bf55662f 100755 --- 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 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 |