diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-11-05 09:30:23 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-11-05 09:31:01 -0500 |
| commit | 73a8408bc3e4806fc102268a78bf52bd3f03c64b (patch) | |
| tree | f72f43725dafbc512aab8cff431d134de9df4ef3 /src/Makefile.test.include | |
| parent | dac2caa371a1c65faf34966c85dbafc30a0c640a (diff) | |
| parent | dfef0df8406528915aaa718e761ce9eaab14ee37 (diff) | |
| download | bitcoin-73a8408bc3e4806fc102268a78bf52bd3f03c64b.tar.xz | |
Merge #14092: tests: Dry run bench_bitcoin as part "make check" to allow for quick identification of assertion/sanitizer failures in benchmarking code
dfef0df840 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 (practicalswift)
00c6306a61 Remove RUN_BENCH logic (practicalswift)
Pull request description:
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 or crashes in benchmarking code.
This is already tested in Travis but it is nice to have it locally too. The cost is near zero.
Tree-SHA512: 1f51b86b34bf97f75785f2694891d80f1bfb3e050211e6f6c35d8d9bc80c75bdebaa5ebfa51855ac0cf76d8773c3026bc576f60d0227afb0e646d728b83abde7
Diffstat (limited to 'src/Makefile.test.include')
| -rw-r--r-- | src/Makefile.test.include | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 4506d5dd6a..a31852c94f 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -169,7 +169,15 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES) $(BITCOIN_T 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=$^ @@ -184,6 +192,13 @@ if BUILD_BITCOIN_TX endif @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 |