tvfs: accommodate python 3 and test there

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 87e78fab1731ec7fe72096cff444273c06c7320d..24d75faae9b04c801b7291fd67603aca57ae2beb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -145,21 +145,21 @@ runtests: runtests-python runtests-cmdline
 
 python_tests := \
   lib/bup/t/tbloom.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/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
+    lib/bup/t/tresolve.py
 endif
 
 # The "pwd -P" here may not be appropriate in the long run, but we
@@ -258,7 +258,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