X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=988a9cc91ab8856755476f56278edf0d4f010dd8;hb=df18bd0224fca3726099c3a60b46d4245288f011;hp=6c4053a7f76e7cb74b36bd39e8cb4512d39c2e83;hpb=ab458f26345e598aeb2fa4b784ff9d0da8ade0fb;p=bup.git

diff --git a/Makefile b/Makefile
index 6c4053a..988a9cc 100644
--- a/Makefile
+++ b/Makefile
@@ -94,9 +94,12 @@ t/tmp:
 runtests: runtests-python runtests-cmdline
 
 runtests-python: all t/tmp
-	TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
+	TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py 2>&1 \
+	| tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test-index.sh \
+  t/test-split-join.sh \
   t/test-fuse.sh \
   t/test-drecurse.sh \
   t/test-cat-file.sh \
@@ -123,7 +126,7 @@ cmdline_tests := \
 
 # For parallel runs.
 tmp-target-run-test%: all t/tmp
-	TMPDIR="$(test_tmp)" t/test$*
+	TMPDIR="$(test_tmp)" t/test$* 2>&1 | tee -a t/tmp/test-log/$$$$.log
 
 runtests-cmdline: $(subst t/test,tmp-target-run-test,$(cmdline_tests))
 
@@ -131,7 +134,11 @@ stupid:
 	PATH=/bin:/usr/bin $(MAKE) test
 
 test: all
-	./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests-python runtests-cmdline
+	if test -e t/tmp/test-log; then rm -r t/tmp/test-log; fi
+	mkdir -p t/tmp/test-log
+	./wvtest watch --no-counts \
+	  $(MAKE) PYTHON=$(PYTHON) runtests-python runtests-cmdline
+	./wvtest report t/tmp/test-log/*.log
 
 check: test