toptions.py: test with python 3

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 7635f900d94bdea3e36db4fd7dba067974e78350..093bf9bb63b06ed291bf78da46895a026ca36c83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -142,52 +142,96 @@ t/tmp:
 
 runtests: runtests-python runtests-cmdline
 
+# The wildcards are not expanded until use
+ifeq "2" "$(bup_python_majver)"
+  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
+  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
 
-cmdline_tests := \
-  t/test-ftp \
-  t/test-save-restore \
-  t/test-packsizelimit \
-  t/test-prune-older \
-  t/test-web.sh \
-  t/test-rm.sh \
-  t/test-gc.sh \
-  t/test-main.sh \
-  t/test-list-idx.sh \
-  t/test-index.sh \
-  t/test-split-join.sh \
-  t/test-fuse.sh \
-  t/test-drecurse.sh \
-  t/test-cat-file.sh \
-  t/test-compression.sh \
-  t/test-fsck.sh \
-  t/test-index-clear.sh \
-  t/test-index-check-device.sh \
-  t/test-ls \
-  t/test-ls-remote \
-  t/test-tz.sh \
-  t/test-meta.sh \
-  t/test-on.sh \
-  t/test-restore-map-owner.sh \
-  t/test-restore-single-file.sh \
-  t/test-rm-between-index-and-save.sh \
-  t/test-save-with-valid-parent.sh \
-  t/test-sparse-files.sh \
-  t/test-command-without-init-fails.sh \
-  t/test-redundant-saves.sh \
-  t/test-save-creates-no-unrefs.sh \
-  t/test-save-restore-excludes.sh \
-  t/test-save-strip-graft.sh \
-  t/test-import-duplicity.sh \
-  t/test-import-rdiff-backup.sh \
-  t/test-xdev.sh \
-  t/test.sh
+ifeq "2" "$(bup_python_majver)"
+  cmdline_tests := \
+    t/test-ftp \
+    t/test-save-restore \
+    t/test-packsizelimit \
+    t/test-prune-older \
+    t/test-web.sh \
+    t/test-rm.sh \
+    t/test-gc.sh \
+    t/test-main.sh \
+    t/test-list-idx.sh \
+    t/test-index.sh \
+    t/test-split-join.sh \
+    t/test-fuse.sh \
+    t/test-drecurse.sh \
+    t/test-cat-file.sh \
+    t/test-compression.sh \
+    t/test-fsck.sh \
+    t/test-index-clear.sh \
+    t/test-index-check-device.sh \
+    t/test-ls \
+    t/test-ls-remote \
+    t/test-tz.sh \
+    t/test-meta.sh \
+    t/test-on.sh \
+    t/test-restore-map-owner.sh \
+    t/test-restore-single-file.sh \
+    t/test-rm-between-index-and-save.sh \
+    t/test-save-with-valid-parent.sh \
+    t/test-sparse-files.sh \
+    t/test-command-without-init-fails.sh \
+    t/test-redundant-saves.sh \
+    t/test-save-creates-no-unrefs.sh \
+    t/test-save-restore-excludes.sh \
+    t/test-save-strip-graft.sh \
+    t/test-import-duplicity.sh \
+    t/test-import-rdiff-backup.sh \
+    t/test-xdev.sh \
+    t/test.sh
+else
+  cmdline_tests :=
+endif
+
+tmp-target-run-test-get-%: all t/tmp
+       $(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
+         t/test-get $* 2>&1 | tee -a t/tmp/test-log/$$$$.log
+
+ifeq "2" "$(bup_python_majver)"
+  test_get_targets := \
+    tmp-target-run-test-get-replace \
+    tmp-target-run-test-get-universal \
+    tmp-target-run-test-get-ff \
+    tmp-target-run-test-get-append \
+    tmp-target-run-test-get-pick \
+    tmp-target-run-test-get-new-tag \
+    tmp-target-run-test-get-unnamed
+else
+  test_get_targets :=
+endif
 
 # For parallel runs.
 # The "pwd -P" here may not be appropriate in the long run, but we
@@ -197,7 +241,7 @@ tmp-target-run-test%: all t/tmp
        $(pf); cd $$(pwd -P); 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: $(test_get_targets) $(subst t/test,tmp-target-run-test,$(cmdline_tests))
 
 stupid:
        PATH=/bin:/usr/bin $(MAKE) test
@@ -206,7 +250,7 @@ test: all
        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) runtests-python runtests-cmdline 2>t/tmp/test-log/$$$$.log
+         $(MAKE) runtests 2>t/tmp/test-log/$$$$.log
        ./wvtest report t/tmp/test-log/*.log
 
 check: test
@@ -220,6 +264,12 @@ cmd/python-cmd.sh: config/config.vars Makefile
        chmod +x cmd/python-cmd.sh.$$PPID.tmp
        mv cmd/python-cmd.sh.$$PPID.tmp cmd/python-cmd.sh
 
+long-test: export BUP_TEST_LEVEL=11
+long-test: test
+
+long-check: export BUP_TEST_LEVEL=11
+long-check: check
+
 cmd/bup-%: cmd/%-cmd.py
        rm -f $@
        ln -s $*-cmd.py $@
@@ -270,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
@@ -284,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