test suite: run-all: Minor refactoring etc.

[dgit.git] / tests / run-all

diff --git a/tests/run-all b/tests/run-all
index 3877c760a0aca1b40d3e756cedabd3ec28b0fef2..3e40369eeb601900f329e4d14457c362c30160d3 100755 (executable)
--- a/tests/run-all
+++ b/tests/run-all
@@ -1,13 +1,20 @@
 #!/bin/bash
 set -e
 # convenience script for running the tests outside adt-run
-# usage: tests/using-intree tests/run-all
+# usage: tests/using-intree tests/run-all [tests/tests/*]
 
 set -o pipefail
 
-set +e
-jcpus=`perl -MSys::CPU -we 'printf "-j%d\n", 1.34 * Sys::CPU::cpu_count()'`
-set -e
+while [ $# != 0 ]; do
+       case "$1" in
+       --)                     shift; break ;;
+       -*)     echo >&2 "run-all: unknown option $1"; exit 20 ;;
+       *)                      break ;;
+       esac
+done
+
+ncpus=$(nproc || echo 1)
+jcpus=-j$(( ncpus * 134 / 100 ))
 
 if [ $# != 0 ]; then
        set TESTSCRIPTS="$*"
@@ -15,6 +22,8 @@ fi
 
 mkdir -p tests/tmp
 
+export DGIT_GNUPG_STUNT_ERRLOG=$( tty -s ||: )
+
 (
  set -x
  exec make $jcpus -k -f tests/Makefile "$@"