X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=89bbffbf52af3f89e9384d61fbd4858443655b22;hb=c32d9436c0cadac78ae03978f5871805a920b900;hp=9f111000c06da7997c7f1b9fb88d1e61c6ef696a;hpb=666dc3c4503d438268bf52599fd914faf9c5e6dc;p=bup.git

diff --git a/Makefile b/Makefile
index 9f11100..89bbffb 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,17 @@ 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-compression.sh \
+  t/test-fsck.sh \
+  t/test-index-clear.sh \
+  t/test-ls \
+  t/test-ls-remote \
+  t/test-tz.sh
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
-    t/test-argv \
     t/test-ftp \
     t/test-save-restore \
     t/test-packsizelimit \
@@ -190,13 +192,7 @@ ifeq "2" "$(bup_python_majver)"
     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 \
@@ -257,9 +253,10 @@ check: test
 distcheck: all
 	./wvtest run t/test-release-archive.sh
 
-cmd/bup-python: cmd/python-cmd.sh config/config.vars Makefile
-	sed -e '$$ d' $< > "$@".$$PPID.tmp
-	printf "exec %q \"\$$@\"\n" "$(bup_python)" >> "$@".$$PPID.tmp
+cmd/bup-python: cmd/python-cmd.sh config/config.var/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
 	mv "$@".$$PPID.tmp "$@"
 
@@ -323,6 +320,7 @@ import-docs: Documentation/clean
 clean: Documentation/clean cmd/bup-python
 	cd config && rm -f *~ .*~ \
 	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
+	cd config && rm -rf config.var
 	rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
 		.*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
 		*.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \