X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=a185bac979dd6d00d749d26328e4b12a4e3483c8;hb=1edb3d2f50b264744544fa3691db6a39a1d8c78a;hp=5c6ef899964558cf6df6ec88f80f0161c4fe33d8;hpb=3550c358a4a0ab94d0fd312fd9fa86ec3ac4741f;p=bup.git

diff --git a/Makefile b/Makefile
index 5c6ef89..a185bac 100644
--- 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' '{}' \; | 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,7 @@ 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 \
@@ -165,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 \