toptions.py: test with python 3

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 3f0b603db6dcc86cdbebbe69a615d3af9c81bd2c..093bf9bb63b06ed291bf78da46895a026ca36c83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -140,18 +140,37 @@ lib/bup/_checkout.py:
 t/tmp:
        mkdir t/tmp
 
+runtests: runtests-python runtests-cmdline
+
+# The wildcards are not expanded until use
 ifeq "2" "$(bup_python_majver)"
-  runtests: runtests-python runtests-cmdline
+  python_tests := \
+    lib/bup/t/tbloom.py \
+    lib/bup/t/tclient.py \
+    lib/bup/t/tgit.py \
+    lib/bup/t/thashsplit.py \
+    lib/bup/t/thelpers.py \
+    lib/bup/t/tindex.py \
+    lib/bup/t/tmetadata.py \
+    lib/bup/t/toptions.py \
+    lib/bup/t/tresolve.py \
+    lib/bup/t/tshquote.py \
+    lib/bup/t/tvfs.py \
+    lib/bup/t/tvint.py \
+    lib/bup/t/txstat.py
 else
-  runtests: runtests-cmdline
+  python_tests := \
+    lib/bup/t/toptions.py \
+    lib/bup/t/tvint.py
 endif
 
 # 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 t/tmp
+       mkdir -p t/tmp/test-log
        $(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-         "$(bup_python)" wvtest.py t/t*.py lib/*/t/t*.py 2>&1 \
+         "$(bup_python)" wvtest.py  $(python_tests) 2>&1 \
            | tee -a t/tmp/test-log/$$$$.log
 
 ifeq "2" "$(bup_python_majver)"
@@ -301,9 +320,12 @@ clean: Documentation/clean cmd/bup-python
        rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
-               bup bup-* \
+               bup \
                randomgen memtest \
                testfs.img lib/bup/t/testfs.img
+       for x in $$(ls cmd/*-cmd.py cmd/*-cmd.sh | grep -vF python-cmd.sh | cut -b 5-); do \
+           echo "cmd/bup-$${x%-cmd.*}"; \
+       done | xargs -t rm -f
        if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
        if test -e t/mnt; then rm -r t/mnt; fi
        if test -e t/tmp; then t/cleanup-mounts-under t/tmp; fi
@@ -315,4 +337,4 @@ clean: Documentation/clean cmd/bup-python
        ./configure-version --clean
        t/configure-sampledata --clean
         # Remove last so that cleanup tools can depend on it
-       rm -f cmd/bup-* cmd/python-cmd.sh
+       rm -f cmd/bup-python cmd/python-cmd.sh