Adjust rm-cmd and bup.rm for python 3 and enable test-rm

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 46a4d33e06e4888022d9107052f52b6ad2308a1b..67cbca2b77c345b22def3749d80b18a4e63ba7a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -174,37 +174,37 @@ cmdline_tests := \
   t/test-compression.sh \
   t/test-drecurse.sh \
   t/test-fsck.sh \
+  t/test-index.sh \
   t/test-index-clear.sh \
   t/test-list-idx.sh \
   t/test-ls \
   t/test-ls-remote \
+  t/test-meta.sh \
+  t/test-packsizelimit \
+  t/test-redundant-saves.sh \
+  t/test-restore-single-file.sh \
+  t/test-rm.sh \
+  t/test-rm-between-index-and-save.sh \
+  t/test-save-creates-no-unrefs.sh \
+  t/test-save-restore \
+  t/test-save-restore-excludes.sh \
+  t/test-save-strip-graft.sh \
+  t/test-save-with-valid-parent.sh \
+  t/test-sparse-files.sh \
+  t/test-split-join.sh \
   t/test-tz.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-index.sh \
-    t/test-split-join.sh \
     t/test-fuse.sh \
     t/test-index-check-device.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-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 \