Skip to content

Commit b1f41fa

Browse files
MarcoFalkeMunkybooty
authored andcommitted
Merge bitcoin#14092: tests: Dry run bench_bitcoin as part "make check" to allow for quick identification of assertion/sanitizer failures in benchmarking code
dfef0df 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) 00c6306 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
1 parent 5f01912 commit b1f41fa

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

src/Makefile.test.include

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,15 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno test/fuzz/*.gcda test/fuzz/*.gcno t
673673

674674
CLEANFILES += $(CLEAN_BITCOIN_TEST)
675675

676+
if TARGET_WINDOWS
676677
dash_test: $(TEST_BINARY)
678+
else
679+
if ENABLE_BENCH
680+
dash_test: $(TEST_BINARY) $(BENCH_BINARY)
681+
else
682+
dash_test: $(TEST_BINARY)
683+
endif
684+
endif
677685

678686
dash_test_check: $(TEST_BINARY) FORCE
679687
$(MAKE) check-TESTS TESTS=$^
@@ -688,6 +696,14 @@ if BUILD_BITCOIN_TX
688696
endif
689697
@echo "Running test/util/rpcauth-test.py..."
690698
$(PYTHON) $(top_builddir)/test/util/rpcauth-test.py
699+
if TARGET_WINDOWS
700+
else
701+
if ENABLE_BENCH
702+
# Disabled because benchmarks are too heavy in Dash
703+
# @echo "Running bench/bench_dash"
704+
# $(BENCH_BINARY)
705+
endif
706+
endif
691707
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
692708
if EMBEDDED_UNIVALUE
693709
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check

0 commit comments

Comments
 (0)