thashsplit: don't assume MINCORE_INCORE is defined

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 11896134586681951ea2ea55de7c40033d4bd256..988a9cc91ab8856755476f56278edf0d4f010dd8 100644 (file)
--- 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 \
@@ -122,16 +125,20 @@ cmdline_tests := \
   t/test.sh
 
 # For parallel runs.
-tmp-target-run-test-%: all t/tmp
-       TMPDIR="$(test_tmp)" t/test-$*
+tmp-target-run-test%: all t/tmp
+       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))
+runtests-cmdline: $(subst t/test,tmp-target-run-test,$(cmdline_tests))
 
 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