From dfef0df8406528915aaa718e761ce9eaab14ee37 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Tue, 28 Aug 2018 13:50:41 +0200 Subject: [PATCH] tests: Dry run bench_bitcoin (-evals=1 -scaling=0: <1 second running time) as part "make check" to allow for quick identification of assertion/sanitizer failures in benchmarking code --- src/Makefile.test.include | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index abfd66efa..5da531768 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -154,7 +154,15 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES) CLEANFILES += $(CLEAN_BITCOIN_TEST) +if TARGET_WINDOWS bitcoin_test: $(TEST_BINARY) +else +if ENABLE_BENCH +bitcoin_test: $(TEST_BINARY) $(BENCH_BINARY) +else +bitcoin_test: $(TEST_BINARY) +endif +endif bitcoin_test_check: $(TEST_BINARY) FORCE $(MAKE) check-TESTS TESTS=$^ @@ -167,6 +175,13 @@ check-local: $(BITCOIN_TESTS:.cpp=.cpp.test) $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py @echo "Running test/util/rpcauth-test.py..." $(PYTHON) $(top_builddir)/test/util/rpcauth-test.py +if TARGET_WINDOWS +else +if ENABLE_BENCH + @echo "Running bench/bench_bitcoin -evals=1 -scaling=0..." + $(BENCH_BINARY) -evals=1 -scaling=0 > /dev/null +endif +endif $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check if EMBEDDED_UNIVALUE $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check