test-restore-map-owner: accommodate python 3 and test there

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 50a34a9352b042022c88c77dbf24e7de07870f1a..3f709a545d332a0c956409afbc5933e212aa217d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -181,6 +181,7 @@ cmdline_tests := \
   t/test-import-duplicity.sh \
   t/test-import-rdiff-backup.sh \
   t/test-index.sh \
+  t/test-index-check-device.sh \
   t/test-index-clear.sh \
   t/test-list-idx.sh \
   t/test-ls \
@@ -191,6 +192,7 @@ cmdline_tests := \
   t/test-packsizelimit \
   t/test-prune-older \
   t/test-redundant-saves.sh \
+  t/test-restore-map-owner.sh \
   t/test-restore-single-file.sh \
   t/test-rm.sh \
   t/test-rm-between-index-and-save.sh \
@@ -201,32 +203,26 @@ cmdline_tests := \
   t/test-save-with-valid-parent.sh \
   t/test-sparse-files.sh \
   t/test-split-join.sh \
-  t/test-tz.sh
+  t/test-tz.sh \
+  t/test-xdev.sh
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
-    t/test-web.sh \
-    t/test-index-check-device.sh \
-    t/test-restore-map-owner.sh \
-    t/test-xdev.sh
+    t/test-web.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