From 845d09ce685f17518f3c8d1ddf4c141de19b384a Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 29 Sep 2015 17:02:02 +0930
Subject: [PATCH] check: simple Makefile target.

This makes it much easier to run all the test scripts.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 Makefile                     | 10 ++++++++++
 test-cli/scripts/setup.sh    |  5 -----
 test-cli/scripts/shutdown.sh |  6 ++++++
 test-cli/scripts/test.sh     | 22 +++++++++++++++-------
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100755 test-cli/scripts/shutdown.sh

diff --git a/Makefile b/Makefile
index 72adb6dd3..b4fad4bc0 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,16 @@ $(PROGRAMS): CFLAGS+=-I.
 
 default: $(PROGRAMS)
 
+# These don't work in parallel, so we open-code them
+test-cli-tests: $(TEST_CLI_PROGRAMS)
+	cd test-cli; scripts/shutdown.sh 2>/dev/null || true
+	set -e; cd test-cli; for args in "" --steal --unilateral --htlc-onchain; do scripts/setup.sh && scripts/test.sh $$args && scripts/shutdown.sh; done
+
+check: test-cli-tests
+
+full-check: check $(TEST_PROGRAMS)
+	test/test_state_coverage
+
 TAGS: FORCE
 	$(RM) TAGS; find . -name '*.[ch]' | xargs etags --append
 FORCE::
diff --git a/test-cli/scripts/setup.sh b/test-cli/scripts/setup.sh
index 5cfd29a33..49e10f45d 100755
--- a/test-cli/scripts/setup.sh
+++ b/test-cli/scripts/setup.sh
@@ -26,8 +26,3 @@ scripts/generate-block.sh init
 A1=`scripts/get-new-address.sh`
 TX=`$CLI sendmany "" "{ \"$A1\":0.01 }"`
 scripts/generate-block.sh
-
-# Find the inputs number corresponding to that 0.01 btc out
-echo "Argument to test.sh:"
-for i in $(seq 1 $($CLI listunspent | grep -c txid) ); do scripts/getinput.sh $i | grep -q "$TX.*/1000000/" && echo -n "$i "; done
-echo
diff --git a/test-cli/scripts/shutdown.sh b/test-cli/scripts/shutdown.sh
new file mode 100755
index 000000000..9d8a210fe
--- /dev/null
+++ b/test-cli/scripts/shutdown.sh
@@ -0,0 +1,6 @@
+#! /bin/sh -e
+
+. `dirname $0`/vars.sh
+
+$CLI stop
+sleep 1 # Make sure socket is closed.
diff --git a/test-cli/scripts/test.sh b/test-cli/scripts/test.sh
index a55116ccd..991f9accd 100755
--- a/test-cli/scripts/test.sh
+++ b/test-cli/scripts/test.sh
@@ -44,15 +44,23 @@ send_after_delay()
     done
 }
 
-if [ $# = 0 ]; then
-    echo Usage: "INPUT" "[--steal|--unilateral|--htlc-onchain]" >&2
+if [ x$1 != x ] && [ x$1 != x--steal ] && [ x$1 != x--unilateral ] && [ x$1 != x--htlc-onchain ]; then
+    echo Usage: "[--steal|--unilateral|--htlc-onchain]" >&2
     exit 1
 fi
-		      
-A_INPUTNUM=$1
-shift
-#A_INPUTNUM=4
-#B_INPUTNUM=1
+
+# Find the inputs number corresponding to that 0.01 btc out
+for i in $(seq 1 $($CLI listunspent | grep -c txid) ); do
+    if scripts/getinput.sh $i | grep -q "$TX.*/1000000/"; then
+       A_INPUTNUM=$i;
+    fi
+done
+
+if [ -z "$A_INPUTNUM" ]; then
+    echo "Can't find 1000000 satoshi input" >&2
+    exit 1
+fi
+
 A_AMOUNT=900000
 
 A_CHANGEADDR=`scripts/get-new-address.sh`