X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=620f90b45b30e926a7221d04ff633ad4798eb885;hb=0cd3ecc81863d8c64f00469e018e712f346d0bfd;hp=6a46b8de7a2829214b016a95850e68461d07f5a5;hpb=e291bccf8ea6e14902460eb9701a3e15108e4958;p=bup.git diff --git a/Makefile b/Makefile index 6a46b8d..620f90b 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\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,9 @@ 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 \ @@ -163,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 \