X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Frun-all;h=c93017192ee428ee1135b133bc39ea4c1f7808b7;hp=f298cb773423df1ca6dabffe0df337962fc0b86f;hb=a676bb68111e13736dd58b4d08c754d6150e359e;hpb=742e4ad0fb818f41aeef52aad862e120b9a5d5af

diff --git a/tests/run-all b/tests/run-all
index f298cb77..c9301719 100755
--- a/tests/run-all
+++ b/tests/run-all
@@ -1,15 +1,33 @@
-#!/bin/sh
+#!/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 [-p|--progressive] [tests/tests/*]
 
-set +e
-jcpus=`perl -MSys::CPU -we 'printf "-j%d\n",Sys::CPU::cpu_count()'`
-set -e
+set -o pipefail
+
+while [ $# != 0 ]; do
+	case "$1" in
+	--progressive|-p)	shift; export DGIT_TESTS_PROGRESSIVE=y;;
+	--)			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="$*"
 fi
 
-set -x
-exec make $jcpus -f tests/Makefile "$@"
+mkdir -p tests/tmp
+
+${DGIT_TESTS_PROGRESSIVE+:} rm -f tests/tmp/*.ok
+
+export DGIT_GNUPG_STUNT_ERRLOG=$( tty -s ||: )
+
+(
+ set -x
+ exec make $jcpus -k -f tests/Makefile "$@"
+) 2>&1 |tee tests/tmp/run-all.log