ftp: accommodate python 3 and test there

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 67cbca2b77c345b22def3749d80b18a4e63ba7a3..a8541b50e1d2025c3602e2abcaa5d8fe545e441e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -174,13 +174,20 @@ cmdline_tests := \
   t/test-compression.sh \
   t/test-drecurse.sh \
   t/test-fsck.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 \
   t/test-ls \
   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 \
@@ -196,17 +203,10 @@ cmdline_tests := \
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
-    t/test-ftp \
-    t/test-prune-older \
     t/test-web.sh \
-    t/test-gc.sh \
-    t/test-main.sh \
     t/test-fuse.sh \
     t/test-index-check-device.sh \
-    t/test-on.sh \
     t/test-restore-map-owner.sh \
-    t/test-import-duplicity.sh \
-    t/test-import-rdiff-backup.sh \
     t/test-xdev.sh \
     t/test.sh
 endif