Skip to content

Commit b5868f4

Browse files
committed
Merge bitcoin/bitcoin#23670: build: Build minisketch test in make check, not in make
6d58117 build: Build minisketch test in `make check`, not in `make` (Hennadii Stepanov) Pull request description: On master (d1e4265): ``` $ ./autogen.sh && ./configure --without-gui --disable-wallet && make clean $ make 2>&1 | grep LD | grep -v .la CXXLD bitcoind CXXLD bitcoin-cli CXXLD bitcoin-tx CXXLD bitcoin-util CXXLD test/test_bitcoin CXXLD bench/bench_bitcoin CXXLD minisketch/test CXXLD test/fuzz/fuzz CXXLD univalue/test/object CXXLD univalue/test/unitester $ make check 2>&1 | grep LD CCLD exhaustive_tests CCLD tests ``` With this PR: ``` $ ./autogen.sh && ./configure --without-gui --disable-wallet && make clean $ make 2>&1 | grep LD | grep -v .la CXXLD bitcoind CXXLD bitcoin-cli CXXLD bitcoin-tx CXXLD bitcoin-util CXXLD test/test_bitcoin CXXLD bench/bench_bitcoin CXXLD test/fuzz/fuzz CXXLD univalue/test/object CXXLD univalue/test/unitester $ make check 2>&1 | grep LD CXXLD minisketch/test CCLD exhaustive_tests CCLD tests ``` In fact, this PR restores behavior that was before bitcoin/bitcoin#22646, and that behavior looks more optimal. As an outcome, the `contrib/guix/libexec/build.sh` does not spend resources to build binaries which are not a part of the release package. ACKs for top commit: TheCharlatan: ACK 6d58117 Tree-SHA512: 4957c8f88a01aca005813bf4c1c26f433756bf68ea0c958481c638ead229fa8e23ecae3a8ac31ea555876ba6f2cc10ecd91caf2e2f664de5cb529ec05fb38fa7
2 parents 1ff254e + 6d58117 commit b5868f4

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

ci/test/06_script_b.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ export LC_ALL=C.UTF-8
99
if [[ $HOST = *-mingw32 ]]; then
1010
# Generate all binaries, so that they can be wrapped
1111
CI_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
12+
CI_EXEC make "$MAKEJOBS" -C src minisketch/test.exe VERBOSE=1
1213
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
1314
fi
1415

1516
if [ -n "$QEMU_USER_CMD" ]; then
1617
# Generate all binaries, so that they can be wrapped
1718
CI_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
19+
CI_EXEC make "$MAKEJOBS" -C src minisketch/test VERBOSE=1
1820
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-qemu.sh"
1921
fi
2022

src/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ noinst_LTLIBRARIES =
2020

2121
bin_PROGRAMS =
2222
noinst_PROGRAMS =
23+
check_PROGRAMS =
2324
TESTS =
2425
BENCHMARKS =
2526

src/Makefile.minisketch.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if ENABLE_TESTS
3131
if !ENABLE_FUZZ
3232
MINISKETCH_TEST = minisketch/test
3333
TESTS += $(MINISKETCH_TEST)
34-
noinst_PROGRAMS += $(MINISKETCH_TEST)
34+
check_PROGRAMS += $(MINISKETCH_TEST)
3535

3636
minisketch_test_SOURCES = $(MINISKETCH_TEST_SOURCES_INT)
3737
minisketch_test_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMINISKETCH_CPPFLAGS)

0 commit comments

Comments
 (0)