bup: don't print subcommands as b'cmd' in help with py3

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 32f0a51d7f594e769610e9e26c9eae3a47977c13..3d129a4e3f7cc71ca67c7bd9370e0a6009aa01b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -120,11 +120,10 @@ install: all
 config/config.h: config/config.vars
 
 lib/bup/_helpers$(SOEXT): \
-               config/config.h \
+               config/config.h lib/bup/bupsplit.h \
                lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
        @rm -f $@
-       cd lib/bup && \
-       LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_python)" csetup.py build
+       cd lib/bup && $(bup_python) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
         # Make sure there's just the one file we expect before we copy it.
        "$(bup_python)" -c \
          "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
@@ -192,11 +191,13 @@ cmdline_tests := \
   t/test-packsizelimit \
   t/test-prune-older \
   t/test-redundant-saves.sh \
+  t/test-restore-map-owner.sh \
   t/test-restore-single-file.sh \
   t/test-rm.sh \
   t/test-rm-between-index-and-save.sh \
   t/test-save-creates-no-unrefs.sh \
   t/test-save-restore \
+  t/test-save-errors \
   t/test-save-restore-excludes.sh \
   t/test-save-strip-graft.sh \
   t/test-save-with-valid-parent.sh \
@@ -206,9 +207,10 @@ cmdline_tests := \
   t/test-xdev.sh
 
 ifeq "2" "$(bup_python_majver)"
+  # unresolved
+  #   web: needs more careful attention, path bytes round-trips, reprs, etc.
   cmdline_tests += \
-    t/test-web.sh \
-    t/test-restore-map-owner.sh
+    t/test-web.sh
 endif
 
 tmp-target-run-test-get-%: all t/tmp