X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=d2c9ab5cf1bc3d11582db11f1a0c8e1e989da6da;hb=a340ef00288ce67944e295e319680df28e674482;hp=87e78fab1731ec7fe72096cff444273c06c7320d;hpb=813aa7d002f141db50ff6d2d276542ed91088043;p=bup.git

diff --git a/Makefile b/Makefile
index 87e78fa..d2c9ab5 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/thelpers.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,11 +167,22 @@ 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-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 \
@@ -184,19 +191,9 @@ ifeq "2" "$(bup_python_majver)"
     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 \
@@ -258,7 +254,7 @@ distcheck: all
 	./wvtest run t/test-release-archive.sh
 
 cmd/bup-python: cmd/python-cmd.sh config/config.var/bup-python
-	dev/replace -l '@bup_python@' \
+	"$$(cat config/config.var/bup-python)" dev/replace -l '@bup_python@' \
 	  "$$(dev/shquote < config/config.var/bup-python)" \
 	  < "$<" > "$@".$$PPID.tmp
 	chmod +x "$@".$$PPID.tmp