X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Frun-all;h=f72b9fae7d0958d490213027070c2736da87bc98;hp=3877c760a0aca1b40d3e756cedabd3ec28b0fef2;hb=0a9d7c678c2ef3a3dbe40c012f3a1b86a8ca3c2a;hpb=6dbc82e06ae1e6840dfa2ef2cc6b496561e6f333

diff --git a/tests/run-all b/tests/run-all
index 3877c760..f72b9fae 100755
--- a/tests/run-all
+++ b/tests/run-all
@@ -5,9 +5,8 @@ set -e
 
 set -o pipefail
 
-set +e
-jcpus=`perl -MSys::CPU -we 'printf "-j%d\n", 1.34 * Sys::CPU::cpu_count()'`
-set -e
+ncpus=$(nproc || echo 1)
+jcpus=-j$(( ncpus * 134 / 100 ))
 
 if [ $# != 0 ]; then
 	set TESTSCRIPTS="$*"
@@ -15,6 +14,8 @@ fi
 
 mkdir -p tests/tmp
 
+export DGIT_GNUPG_STUNT_ERRLOG=$( tty -s ||: )
+
 (
  set -x
  exec make $jcpus -k -f tests/Makefile "$@"