_helpers: fix module init, and get it at least building with py3

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index c3c115561f9bda4552a23ce73986abba493e1ea4..620f90b45b30e926a7221d04ff633ad4798eb885 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,10 @@ lib/bup/_helpers$(SOEXT): \
        @rm -f $@
        cd lib/bup && \
        LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_python)" csetup.py build
-       cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
+        # Make sure there's just the one file we expect before we copy it.
+       find lib/bup/build/* -maxdepth 1 -name '_helpers*$(SOEXT)' \
+         -exec printf 'x\c' '{}' \; | wc -c | xargs test 1 -eq
+       cp lib/bup/build/*/_helpers*$(SOEXT) "$@"
 
 lib/bup/_checkout.py:
        @if grep -F '$Format' lib/bup/_release.py \
@@ -148,6 +151,10 @@ runtests-python: all t/tmp
            | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test-ftp \
+  t/test-save-restore \
+  t/test-packsizelimit \
+  t/test-prune-older \
   t/test-web.sh \
   t/test-rm.sh \
   t/test-gc.sh \
@@ -162,7 +169,8 @@ cmdline_tests := \
   t/test-fsck.sh \
   t/test-index-clear.sh \
   t/test-index-check-device.sh \
-  t/test-ls.sh \
+  t/test-ls \
+  t/test-ls-remote \
   t/test-tz.sh \
   t/test-meta.sh \
   t/test-on.sh \