Skip to content

Commit c131b27

Browse files
millertmillert
committed
For 'make check-verbose' run fuzzers with -verbose=1
This is the default for libFuzzer but not for the stub fuzzer lib.
1 parent ecaa8ab commit c131b27

7 files changed

Lines changed: 26 additions & 22 deletions

File tree

‎lib/eventlog/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ check: $(TEST_PROGS) check-fuzzer
170170
fi
171171

172172
check-verbose:
173-
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
173+
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v FUZZ_VERBOSE=-verbosity=1 check
174174

175175
clean:
176176
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la $(TEST_PROGS)

‎lib/iolog/Makefile.in‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ FUZZ_LIBS = $(LIB_FUZZING_ENGINE) @LIBS@
9292
FUZZ_LDFLAGS = @LDFLAGS@
9393
FUZZ_MAX_LEN = 4096
9494
FUZZ_RUNS = 8192
95+
FUZZ_VERBOSE =
9596

9697
# Set to non-empty for development mode
9798
DEVEL = @DEVEL@
@@ -216,7 +217,7 @@ run-fuzz_iolog_json: fuzz_iolog_json
216217
for f in $(FUZZ_IOLOG_JSON_CORPUS); do \
217218
cp $$f $$corpus; \
218219
done; \
219-
./fuzz_iolog_json -dict=$(srcdir)/regress/fuzz/fuzz_iolog_json.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
220+
./fuzz_iolog_json -dict=$(srcdir)/regress/fuzz/fuzz_iolog_json.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
220221

221222
fuzz_iolog_legacy_seed_corpus.zip:
222223
tdir=fuzz_iolog_legacy.$$$$; \
@@ -242,7 +243,7 @@ run-fuzz_iolog_legacy: fuzz_iolog_legacy
242243
for f in $(FUZZ_IOLOG_LEGACY_CORPUS); do \
243244
cp $$f $$corpus; \
244245
done; \
245-
./fuzz_iolog_legacy -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
246+
./fuzz_iolog_legacy -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
246247

247248
fuzz_iolog_timing_seed_corpus.zip:
248249
tdir=fuzz_iolog_timing.$$$$; \
@@ -268,7 +269,7 @@ run-fuzz_iolog_timing: fuzz_iolog_timing
268269
for f in $(FUZZ_IOLOG_TIMING_CORPUS); do \
269270
cp $$f $$corpus; \
270271
done; \
271-
./fuzz_iolog_timing -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
272+
./fuzz_iolog_timing -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
272273

273274
pre-install:
274275

@@ -313,11 +314,11 @@ check-fuzzer: $(FUZZ_PROGS)
313314
MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \
314315
MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \
315316
echo "fuzz_iolog_legacy: verifying corpus"; \
316-
./fuzz_iolog_legacy $(FUZZ_IOLOG_LEGACY_CORPUS); \
317+
./fuzz_iolog_legacy $(FUZZ_VERBOSE) $(FUZZ_IOLOG_LEGACY_CORPUS); \
317318
echo "fuzz_iolog_json: verifying corpus"; \
318-
./fuzz_iolog_json $(FUZZ_IOLOG_JSON_CORPUS); \
319+
./fuzz_iolog_json $(FUZZ_VERBOSE) $(FUZZ_IOLOG_JSON_CORPUS); \
319320
echo "fuzz_iolog_timing: verifying corpus"; \
320-
./fuzz_iolog_timing $(FUZZ_IOLOG_TIMING_CORPUS); \
321+
./fuzz_iolog_timing $(FUZZ_VERBOSE) $(FUZZ_IOLOG_TIMING_CORPUS); \
321322
fi
322323

323324
check: $(TEST_PROGS) check-fuzzer
@@ -341,7 +342,7 @@ check: $(TEST_PROGS) check-fuzzer
341342
fi
342343

343344
check-verbose:
344-
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
345+
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v FUZZ_VERBOSE=-verbosity=1 check
345346

346347
clean:
347348
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \

‎lib/util/Makefile.in‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ FUZZ_LIBS = $(LIB_FUZZING_ENGINE) @LIBS@
128128
FUZZ_LDFLAGS = @LDFLAGS@
129129
FUZZ_MAX_LEN = 4096
130130
FUZZ_RUNS = 8192
131+
FUZZ_VERBOSE =
131132

132133
# User and group ids the installed files should be "owned" by
133134
install_uid = 0
@@ -349,7 +350,7 @@ run-fuzz_sudo_conf: fuzz_sudo_conf
349350
for f in $(FUZZ_SUDO_CONF_CORPUS); do \
350351
cp $$f $$corpus; \
351352
done; \
352-
./fuzz_sudo_conf -dict=$(srcdir)/regress/fuzz/fuzz_sudo_conf.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
353+
./fuzz_sudo_conf -dict=$(srcdir)/regress/fuzz/fuzz_sudo_conf.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
353354

354355
pre-install:
355356

@@ -406,7 +407,7 @@ check-fuzzer: $(FUZZ_PROGS)
406407
MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \
407408
MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \
408409
echo "fuzz_sudo_conf: verifying corpus"; \
409-
./fuzz_sudo_conf $(FUZZ_SUDO_CONF_CORPUS); \
410+
./fuzz_sudo_conf $(FUZZ_VERBOSE) $(FUZZ_SUDO_CONF_CORPUS); \
410411
fi
411412

412413
# Note: some regress checks are run from srcdir for consistent error messages
@@ -468,7 +469,7 @@ check: $(TEST_PROGS) check-fuzzer
468469
fi
469470

470471
check-verbose:
471-
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
472+
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v FUZZ_VERBOSE=-verbosity=1 check
472473

473474
clean:
474475
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \

‎logsrvd/Makefile.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ FUZZ_LIBS = $(LIB_FUZZING_ENGINE) $(LIBS)
109109
FUZZ_LDFLAGS = $(LDFLAGS)
110110
FUZZ_MAX_LEN = 4096
111111
FUZZ_RUNS = 8192
112+
FUZZ_VERBOSE =
112113

113114
# User and group IDs the installed files should be "owned" by
114115
install_uid = 0
@@ -195,7 +196,7 @@ run-fuzz_logsrvd_conf: fuzz_logsrvd_conf
195196
for f in $(FUZZ_LOGSRVD_CONF_CORPUS); do \
196197
cp $$f $$corpus; \
197198
done; \
198-
./fuzz_logsrvd_conf -dict=$(srcdir)/regress/fuzz/fuzz_logsrvd_conf.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
199+
./fuzz_logsrvd_conf -dict=$(srcdir)/regress/fuzz/fuzz_logsrvd_conf.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
199200

200201
pre-install:
201202

@@ -252,7 +253,7 @@ check-fuzzer: $(FUZZ_PROGS)
252253
MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \
253254
MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \
254255
echo "fuzz_logsrvd_conf: verifying corpus"; \
255-
./fuzz_logsrvd_conf $(FUZZ_LOGSRVD_CONF_CORPUS); \
256+
./fuzz_logsrvd_conf $(FUZZ_VERBOSE) $(FUZZ_LOGSRVD_CONF_CORPUS); \
256257
fi
257258

258259
check: check-fuzzer

‎plugins/python/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ check: $(TEST_PROGS) check-fuzzer
240240
fi
241241

242242
check-verbose:
243-
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
243+
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v FUZZ_VERBOSE=-verbosity=1 check
244244

245245
update_test_data: $(TEST_PROGS)
246246
@if test X"$(cross_compiling)" != X"yes"; then \

‎plugins/sudoers/Makefile.in‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ FUZZ_LIBS = libparsesudoers.la @SUDOERS_LIBS@ $(LIB_FUZZING_ENGINE)
171171
FUZZ_LDFLAGS = @SUDOERS_LDFLAGS@
172172
FUZZ_MAX_LEN = 4096
173173
FUZZ_RUNS = 8192
174+
FUZZ_VERBOSE =
174175

175176
AUTH_OBJS = sudo_auth.lo @AUTH_OBJS@
176177

@@ -442,7 +443,7 @@ run-fuzz_policy: fuzz_policy
442443
for f in $(FUZZ_POLICY_CORPUS); do \
443444
cp $$f $$corpus; \
444445
done; \
445-
./fuzz_policy -dict=$(srcdir)/regress/fuzz/fuzz_policy.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
446+
./fuzz_policy -dict=$(srcdir)/regress/fuzz/fuzz_policy.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
446447

447448
fuzz_sudoers_seed_corpus.zip:
448449
tdir=fuzz_sudoers.$$$$; \
@@ -468,7 +469,7 @@ run-fuzz_sudoers: fuzz_sudoers
468469
for f in $(FUZZ_SUDOERS_CORPUS); do \
469470
cp $$f $$corpus; \
470471
done; \
471-
./fuzz_sudoers -dict=$(srcdir)/regress/fuzz/fuzz_sudoers.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
472+
./fuzz_sudoers -dict=$(srcdir)/regress/fuzz/fuzz_sudoers.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
472473

473474
fuzz_sudoers_ldif_seed_corpus.zip:
474475
tdir=fuzz_sudoers_ldif.$$$$; \
@@ -494,7 +495,7 @@ run-fuzz_sudoers_ldif: fuzz_sudoers_ldif
494495
for f in $(FUZZ_SUDOERS_LDIF_CORPUS); do \
495496
cp $$f $$corpus; \
496497
done; \
497-
./fuzz_sudoers_ldif -dict=$(srcdir)/regress/fuzz/fuzz_sudoers_ldif.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $$corpus
498+
./fuzz_sudoers_ldif -dict=$(srcdir)/regress/fuzz/fuzz_sudoers_ldif.dict -max_len=$(FUZZ_MAX_LEN) -runs=$(FUZZ_RUNS) $(FUZZ_VERBOSE) $$corpus
498499

499500
GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate.c
500501

@@ -638,11 +639,11 @@ check-fuzzer: $(FUZZ_PROGS)
638639
MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \
639640
MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \
640641
echo "fuzz_sudoers: verifying corpus"; \
641-
./fuzz_sudoers $(FUZZ_SUDOERS_CORPUS); \
642+
./fuzz_sudoers $(FUZZ_VERBOSE) $(FUZZ_SUDOERS_CORPUS); \
642643
echo "fuzz_sudoers-ldif: verifying corpus"; \
643-
./fuzz_sudoers_ldif $(FUZZ_SUDOERS_LDIF_CORPUS); \
644+
./fuzz_sudoers_ldif $(FUZZ_VERBOSE) $(FUZZ_SUDOERS_LDIF_CORPUS); \
644645
echo "fuzz_policy: verifying corpus"; \
645-
./fuzz_policy $(FUZZ_POLICY_CORPUS); \
646+
./fuzz_policy $(FUZZ_VERBOSE) $(FUZZ_POLICY_CORPUS); \
646647
fi
647648

648649
check: $(TEST_PROGS) visudo testsudoers cvtsudoers check-fuzzer
@@ -686,7 +687,7 @@ check: $(TEST_PROGS) visudo testsudoers cvtsudoers check-fuzzer
686687
fi
687688

688689
check-verbose:
689-
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
690+
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v FUZZ_VERBOSE=-verbosity=1 check
690691

691692
clean:
692693
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \

‎src/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ check: $(TEST_PROGS) check-fuzzer
341341
fi
342342

343343
check-verbose:
344-
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
344+
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v FUZZ_VERBOSE=-verbosity=1 check
345345

346346
clean:
347347
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \

0 commit comments

Comments
 (0)