get: adjust for python 3 and test there

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 257c2ce85a3bc488595894f536f737561ad5efa5..ac18a583b142ac6c0c4883875495d8cb2e972a16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -168,14 +168,18 @@ runtests-python: all t/tmp
            | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test.sh \
   t/test-argv \
   t/test-cat-file.sh \
   t/test-command-without-init-fails.sh \
   t/test-compression.sh \
   t/test-drecurse.sh \
   t/test-fsck.sh \
+  t/test-fuse.sh \
+  t/test-ftp \
   t/test-gc.sh \
   t/test-import-duplicity.sh \
+  t/test-import-rdiff-backup.sh \
   t/test-index.sh \
   t/test-index-clear.sh \
   t/test-list-idx.sh \
@@ -183,7 +187,9 @@ cmdline_tests := \
   t/test-ls-remote \
   t/test-main.sh \
   t/test-meta.sh \
+  t/test-on.sh \
   t/test-packsizelimit \
+  t/test-prune-older \
   t/test-redundant-saves.sh \
   t/test-restore-single-file.sh \
   t/test-rm.sh \
@@ -199,34 +205,24 @@ cmdline_tests := \
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
-    t/test-ftp \
-    t/test-prune-older \
     t/test-web.sh \
-    t/test-fuse.sh \
     t/test-index-check-device.sh \
-    t/test-on.sh \
     t/test-restore-map-owner.sh \
-    t/test-import-rdiff-backup.sh \
-    t/test-xdev.sh \
-    t/test.sh
+    t/test-xdev.sh
 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
 
-test_get_targets :=
-
-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
-endif
+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
 
 # For parallel runs.
 # The "pwd -P" here may not be appropriate in the long run, but we