X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Frun-all;h=c93017192ee428ee1135b133bc39ea4c1f7808b7;hp=551e51ffb8ea298e522c16b08ea92a9e0c83a3c2;hb=66d19f834577d2495c8255f042aff4d86d040049;hpb=a110a1029e0eefe70bb1c057620c4102c6a52165

diff --git a/tests/run-all b/tests/run-all
index 551e51ff..c9301719 100755
--- a/tests/run-all
+++ b/tests/run-all
@@ -1,10 +1,33 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 # convenience script for running the tests outside adt-run
-for f in `run-parts --list tests/tests`; do
-	echo ==================================================
-	echo $f
-	$f
-	echo ==================================================
+# usage: tests/using-intree tests/run-all [-p|--progressive] [tests/tests/*]
+
+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
-echo "ALL PASSED"
+
+ncpus=$(nproc || echo 1)
+jcpus=-j$(( ncpus * 134 / 100 ))
+
+if [ $# != 0 ]; then
+	set TESTSCRIPTS="$*"
+fi
+
+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