diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-02-08 18:30:24 +0100 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-06-22 08:12:23 +0200 |
| commit | fa7cbc6e5c36f1e37d18ffe1084cfccf52cbc296 (patch) | |
| tree | 70234fa1f97c7359bf60b57fcbd5ad7fcb8deee0 | |
| parent | e3b06e8dd8982155a97cfd090c01d06455a3c84d (diff) | |
| download | bitcoin-fa7cbc6e5c36f1e37d18ffe1084cfccf52cbc296.tar.xz | |
build: Remove negated --enable-fuzz checks from build system
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.test.include | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 163f69988e..682923096d 100644 --- a/configure.ac +++ b/configure.ac @@ -1303,6 +1303,7 @@ if test "$enable_fuzz" = "yes"; then bitcoin_enable_qt_test=no bitcoin_enable_qt_dbus=no use_bench=no + use_tests=no use_external_signer=no use_upnp=no use_natpmp=no @@ -1559,7 +1560,7 @@ fi dnl libevent check use_libevent=no -if test "$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench" != "nonononono"; then +if test "$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$enable_fuzz_binary$use_tests$use_bench" != "nononononono"; then PKG_CHECK_MODULES([EVENT], [libevent >= 2.1.8], [use_libevent=yes], [AC_MSG_ERROR([libevent version 2.1.8 or greater not found.])]) if test "$TARGET_OS" != "windows"; then PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads >= 2.1.8], [], [AC_MSG_ERROR([libevent_pthreads version 2.1.8 or greater not found.])]) @@ -1846,8 +1847,8 @@ else AC_MSG_RESULT([no]) fi -if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononononononono"; then - AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-bench or --enable-tests]) +if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$enable_fuzz_binary$use_bench$use_tests" = "nonononononononono"; then + AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-fuzz(-binary) --enable-bench or --enable-tests]) fi AM_CONDITIONAL([TARGET_DARWIN], [test "$TARGET_OS" = "darwin"]) diff --git a/src/Makefile.am b/src/Makefile.am index fa716af619..a3b975809b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1053,9 +1053,7 @@ include Makefile.leveldb.include include Makefile.test_util.include include Makefile.test_fuzz.include -if ENABLE_TESTS include Makefile.test.include -endif if ENABLE_BENCH include Makefile.bench.include diff --git a/src/Makefile.test.include b/src/Makefile.test.include index ebd9e860cf..098feacb3d 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -6,7 +6,7 @@ if ENABLE_FUZZ_BINARY noinst_PROGRAMS += test/fuzz/fuzz endif -if !ENABLE_FUZZ +if ENABLE_TESTS bin_PROGRAMS += test/test_bitcoin endif @@ -371,7 +371,7 @@ endif endif $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check -if !ENABLE_FUZZ +if ENABLE_TESTS UNIVALUE_TESTS = univalue/test/object univalue/test/unitester univalue/test/no_nul noinst_PROGRAMS += $(UNIVALUE_TESTS) TESTS += $(UNIVALUE_TESTS) |