bup: make sure stdout and stderr are binary for subcmds

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index e5e2b67c1820b9e2cfbd41ce3a0a394d0b54114a..9f111000c06da7997c7f1b9fb88d1e61c6ef696a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,9 @@ t/tmp:
 runtests: runtests-python runtests-cmdline
 
 python_tests := \
+  lib/bup/t/tbloom.py \
   lib/bup/t/thashsplit.py \
+  lib/bup/t/tindex.py \
   lib/bup/t/toptions.py \
   lib/bup/t/tshquote.py \
   lib/bup/t/tvint.py \
@@ -152,11 +154,9 @@ python_tests := \
 
 ifeq "2" "$(bup_python_majver)"
   python_tests += \
-    lib/bup/t/tbloom.py \
     lib/bup/t/tclient.py \
     lib/bup/t/tgit.py \
     lib/bup/t/thelpers.py \
-    lib/bup/t/tindex.py \
     lib/bup/t/tmetadata.py \
     lib/bup/t/tresolve.py \
     lib/bup/t/tvfs.py
@@ -175,6 +175,7 @@ cmdline_tests :=
 
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
+    t/test-argv \
     t/test-ftp \
     t/test-save-restore \
     t/test-packsizelimit \
@@ -257,7 +258,7 @@ distcheck: all
        ./wvtest run t/test-release-archive.sh
 
 cmd/bup-python: cmd/python-cmd.sh config/config.vars Makefile
-       head -n -1 $< > "$@".$$PPID.tmp
+       sed -e '$$ d' $< > "$@".$$PPID.tmp
        printf "exec %q \"\$$@\"\n" "$(bup_python)" >> "$@".$$PPID.tmp
        chmod +x "$@".$$PPID.tmp
        mv "$@".$$PPID.tmp "$@"