make check: run all the tests.

We can't run them in parallel, but we can at least have 'make check' run them all. Developers should be running "make check-source && make check". Signed-off-by: Rusty Russell <[email protected]>
digitaltask · Feb 2, 2017 · a02f1e1 · a02f1e1
1 parent 05cf316
commit a02f1e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -229,7 +229,11 @@ $(HELPER_OBJS) $(CORE_OBJS) $(CORE_TX_OBJS) $(CORE_PROTOBUF_OBJS) $(BITCOIN_OBJS
 test-protocol: test/test_protocol
 	set -e; TMP=`mktemp`; for f in test/commits/*.script; do if ! $(VALGRIND) test/test_protocol < $$f > $$TMP; then echo "test/test_protocol < $$f FAILED" >&2; exit 1; fi; diff -u $$TMP $$f.expected; done; rm $$TMP
 
+# FIXME: check doesn't depend on lightningd-blackbox-tests, since they
+# can't run in parallel with daemon blackbox tests.
 check: test-protocol
+	$(MAKE) lightningd-blackbox-tests
+	$(MAKE) pytest
 
 pytest: daemon/lightningd
 	PYTHONPATH=contrib/pylightning python3 tests/test_lightningd.py

diff --git a/lightningd/test/Makefile b/lightningd/test/Makefile
@@ -1,7 +1,4 @@
-# FIXME: check doesn't cover lightningd-blackbox-tests, since they
-# can't run in parallel with daemon blackbox tests.
-
-check: lightningd/tests #lightningd-blackbox-tests
+check: lightningd/tests
 
 # Note that these actually #include everything they need, except ccan/ and bitcoin/.
 # That allows for unit testing of statics, and special effects.