X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Frun-all;h=f72b9fae7d0958d490213027070c2736da87bc98;hb=a2ef997796b3affd1fc68baa0a9e654f282ea758;hp=e53b96317bac8a13e1b5b0f1d47249e585ab03cf;hpb=f773b1ed2796196e0fa801886fce493544c38fe0;p=dgit.git

diff --git a/tests/run-all b/tests/run-all
index e53b9631..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",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 "$@"