X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=270653c777153b787d9dda39c30134ad4d8126ad;hb=51369249eb13f732a07368defbd27b06cb0ed5e3;hp=3c6d522482577661d4641cab3ff04c2e5e0a7574;hpb=88f7fbebef60f0d8e5ebae8579cd249be6331ea3;p=bup.git

diff --git a/Makefile b/Makefile
index 3c6d522..270653c 100644
--- a/Makefile
+++ b/Makefile
@@ -161,31 +161,8 @@ test/tmp:
 
 runtests: runtests-python runtests-cmdline
 
-python_tests := \
-  test/int/tbloom.py \
-  test/int/tclient.py \
-  test/int/tcompat.py \
-  test/int/tgit.py \
-  test/int/thashsplit.py \
-  test/int/thelpers.py \
-  test/int/tindex.py \
-  test/int/tmetadata.py \
-  test/int/toptions.py \
-  test/int/tresolve.py \
-  test/int/tshquote.py \
-  test/int/tvfs.py \
-  test/int/tvint.py \
-  test/int/txstat.py
-
-
-# The "pwd -P" here may not be appropriate in the long run, but we
-# need it until we settle the relevant drecurse/exclusion questions:
-# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
 runtests-python: all test/tmp
-	mkdir -p test/tmp/test-log
-	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-	  ./wvtest.py  $(python_tests) 2>&1 \
-	    | tee -a test/tmp/test-log/$$$$.log
+	./pytest
 
 cmdline_tests := \
   test/ext/test.sh \
@@ -258,8 +235,9 @@ stupid:
 test: all
 	if test -e test/tmp/test-log; then rm -r test/tmp/test-log; fi
 	mkdir -p test/tmp/test-log
+	$(MAKE) runtests-python
 	./wvtest watch --no-counts \
-	  $(MAKE) runtests 2>test/tmp/test-log/$$$$.log
+	  $(MAKE) runtests-cmdline 2>test/tmp/test-log/$$$$.log
 	./wvtest report test/tmp/test-log/*.log
 
 check: test