Skip to content

Commit 21d6fed

Browse files
committed
Merge bitcoin/bitcoin#21884: fuzz: Remove unused --enable-danger-fuzz-link-all option
fa27d6d fuzz: Remove unused --enable-danger-fuzz-link-all option (MarcoFalke) Pull request description: Remove the unused build option, which was *dangerous* (as the name implies). Also remove the fuzzbuzz config, which was never used as part of this repo and seems redundant now that we integrate with oss-fuzz. ACKs for top commit: practicalswift: cr ACK fa27d6d: patch looks correct and rationale makes sense hebasto: ACK fa27d6d, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 9bd65ed6a76d13d8d9c7a88aaae30f701215d5d0619693a3115d5ec350808aaf6a1aa4737466a5b96f3948513ec4d063808fe16219818366720e247880a15177
2 parents 9313c4e + fa27d6d commit 21d6fed

File tree

4 files changed

+0
-56
lines changed

4 files changed

+0
-56
lines changed

.fuzzbuzz.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

configure.ac

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,6 @@ AC_ARG_ENABLE([fuzz-binary],
194194
[enable_fuzz_binary=$enableval],
195195
[enable_fuzz_binary=yes])
196196

197-
AC_ARG_ENABLE([danger_fuzz_link_all],
198-
AS_HELP_STRING([--enable-danger-fuzz-link-all],
199-
[Danger! Modifies source code. Needs git and gnu sed installed. Link each fuzz target (default no).]),
200-
[enable_danger_fuzz_link_all=$enableval],
201-
[enable_danger_fuzz_link_all=no])
202-
203197
AC_ARG_WITH([qrencode],
204198
[AS_HELP_STRING([--with-qrencode],
205199
[enable QR code support (default is yes if qt is enabled and libqrencode is found)])],
@@ -1790,7 +1784,6 @@ AM_CONDITIONAL([ENABLE_TRACING],[test x$have_sdt = xyes])
17901784
AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
17911785
AM_CONDITIONAL([ENABLE_FUZZ],[test x$enable_fuzz = xyes])
17921786
AM_CONDITIONAL([ENABLE_FUZZ_BINARY],[test x$enable_fuzz_binary = xyes])
1793-
AM_CONDITIONAL([ENABLE_FUZZ_LINK_ALL],[test x$enable_danger_fuzz_link_all = xyes])
17941787
AM_CONDITIONAL([ENABLE_QT],[test x$bitcoin_enable_qt = xyes])
17951788
AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
17961789
AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])

src/Makefile.test.include

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,6 @@ if EMBEDDED_UNIVALUE
350350
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check
351351
endif
352352

353-
if ENABLE_FUZZ_LINK_ALL
354-
all-local: $(FUZZ_BINARY)
355-
bash ./test/fuzz/danger_link_all.sh
356-
endif
357-
358353
%.cpp.test: %.cpp
359354
@echo Running tests: `cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1` from $<
360355
$(AM_V_at)$(TEST_BINARY) --catch_system_errors=no -l test_suite -t "`cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1`" -- DEBUG_LOG_OUT > $<.log 2>&1 || (cat $<.log && false)

src/test/fuzz/danger_link_all.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)