X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=0bab1231a487f1e6a69fd54ff2f91bd7bd3a9b26;hb=7031a27141fa053d2a158ff37f8662dc9d2c60f3;hp=b6add57d119de4c6dbc2906b15096faeadd5df9b;hpb=0c4fe2f42b1ba636fe625d5d87e0148b2c783618;p=bup.git

diff --git a/Makefile b/Makefile
index b6add57..0bab123 100644
--- a/Makefile
+++ b/Makefile
@@ -145,23 +145,19 @@ runtests: runtests-python runtests-cmdline
 
 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
 
-ifeq "2" "$(bup_python_majver)"
-  python_tests += \
-    lib/bup/t/tclient.py \
-    lib/bup/t/tgit.py \
-    lib/bup/t/tmetadata.py \
-    lib/bup/t/tresolve.py \
-    lib/bup/t/tvfs.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
@@ -171,32 +167,33 @@ runtests-python: all t/tmp
 	  ./wvtest.py  $(python_tests) 2>&1 \
 	    | tee -a t/tmp/test-log/$$$$.log
 
-cmdline_tests :=
+cmdline_tests := \
+  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-index-clear.sh \
+  t/test-list-idx.sh \
+  t/test-ls \
+  t/test-ls-remote \
+  t/test-packsizelimit \
+  t/test-split-join.sh \
+  t/test-tz.sh
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
-    t/test-argv \
     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 \
@@ -204,7 +201,6 @@ ifeq "2" "$(bup_python_majver)"
     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 \