diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-11-22 09:15:45 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-11-22 09:21:02 -0500 |
| commit | b983e7e1721fa68cc04c05b1249d5871d66debe5 (patch) | |
| tree | e54a01f4b569635f25b8a3e449ab9227e6c8b7fc /src/Makefile.bench.include | |
| parent | a739d207a39fc34c2e5adf4e14bfbb3a6288ede1 (diff) | |
| parent | a2e581de942ece85b84c4f5a15287654b02867cb (diff) | |
| download | bitcoin-b983e7e1721fa68cc04c05b1249d5871d66debe5.tar.xz | |
Merge #17542: build: Create test utility library from src/test/util/
a2e581de942ece85b84c4f5a15287654b02867cb build: Create test utility library from src/test/util/ (Harris)
Pull request description:
This PR creates a static **test utility library** that replaces repetitive compilations of sources from *src/test/util* in **unit**, **gui** and **bench** **tests**.
The original issue is here: https://github.com/bitcoin/bitcoin/issues/17401
The changes are:
* a new *Makefile.test_util.include*
* a new entry in *Makefile.am* that includes *Makefile.test_util.include* when testing is enabled
* removal of all *src/test/util* headers & sources from unit, gui and bench Makefiles
* addition of *libtest_util.a* at LDADD's of every test
ACKs for top commit:
MarcoFalke:
ACK a2e581de942ece85b84c4f5a15287654b02867cb 🍞
Tree-SHA512: d172127a26ee70d16625e17d7d94337a65472c57bb97f910c357c52d3dc082ea478ee586ee9074d9ebfeb05b75027e5e15f5bcd2aa35962dadfd9ac6bfd55ab9
Diffstat (limited to 'src/Makefile.bench.include')
| -rw-r--r-- | src/Makefile.bench.include | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index acd712c8a2..9e70db116b 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -40,10 +40,6 @@ bench_bench_bitcoin_SOURCES = \ bench/lockedpool.cpp \ bench/poly1305.cpp \ bench/prevector.cpp \ - test/util/transaction_utils.h \ - test/util/transaction_utils.cpp \ - test/util/setup_common.h \ - test/util/setup_common.cpp \ test/util.h \ test/util.cpp @@ -59,6 +55,7 @@ bench_bench_bitcoin_LDADD = \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CONSENSUS) \ $(LIBBITCOIN_CRYPTO) \ + $(LIBTEST_UTIL) \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) \ |