...

diff --git a/Makefile.am b/Makefile.am
index c4e4179ba5a57cc84f197fc783caaf0868090dc5..1224485d67ba4a4169867dd01050b2450c768cb9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,10 @@ cold_SOURCES += \
        inc/main.h
 
 check-local:
+       @-ps -A | grep bitcoind > /dev/null && echo "ERROR: bitcoind running; can't run tests"
+       @[[ ! "`ps -A | grep bitcoind > /dev/null && echo "bitcoind running"`" != "" ]] && echo ""
        @head -n `grep -n "main()" cold-setup | cut -f1 -d:` cold-setup | head -n -1 > test/source.sh
+       @-rm -rf test/.testdir
        @cd test && run-parts --exit-on-error --regex '.*\.tests\.sh' .
        @rm -rf test/.testdir