diff --git a/Makefile.in b/Makefile.in index 5c93333e8..6de746f75 100644 --- a/Makefile.in +++ b/Makefile.in @@ -110,7 +110,7 @@ all: config.status exit $$?; \ done -check check-fuzzer fuzz pre-install: config.status +check check-verbose check-fuzzer fuzz pre-install: config.status for d in $(SUBDIRS); do \ (cd $$d && exec $(MAKE) $@) && continue; \ exit $$?; \ @@ -146,7 +146,7 @@ splint: config.status cov-build: make clean - cov-build --dir cov-int make ${MFLAGS} all + cov-build --dir cov-int make $(MFLAGS) all cov-upload: tar zcf cov-int.tgz cov-int diff --git a/docs/Makefile.in b/docs/Makefile.in index 8b526cd92..afd0c491b 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -414,6 +414,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -rm -f fixman.sed diff --git a/examples/Makefile.in b/examples/Makefile.in index 595cfdf99..706e6cce7 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -119,6 +119,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: mostlyclean: clean diff --git a/include/Makefile.in b/include/Makefile.in index 79aefbefb..92f05632f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -96,6 +96,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: mostlyclean: clean diff --git a/lib/eventlog/Makefile.in b/lib/eventlog/Makefile.in index 7f62355d4..ff3c13de5 100644 --- a/lib/eventlog/Makefile.in +++ b/lib/eventlog/Makefile.in @@ -81,6 +81,7 @@ DEVEL = @DEVEL@ SHELL = @SHELL@ TEST_PROGS = check_wrap +TEST_VERBOSE = LIBEVENTLOG_OBJS = eventlog.lo eventlog_conf.lo eventlog_free.lo logwrap.lo @@ -168,6 +169,9 @@ check: $(TEST_PROGS) check-fuzzer exit $$rval; \ fi +check-verbose: + exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la $(TEST_PROGS) -rm -f *.i *.plog stamp-* core *.core core.* regress/*/*.out diff --git a/lib/fuzzstub/Makefile.in b/lib/fuzzstub/Makefile.in index 5f6ad0c2b..ff308d251 100644 --- a/lib/fuzzstub/Makefile.in +++ b/lib/fuzzstub/Makefile.in @@ -145,6 +145,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -rm -f *.i *.plog stamp-* core *.core core.* diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in index c2759dbdd..165ff8831 100644 --- a/lib/iolog/Makefile.in +++ b/lib/iolog/Makefile.in @@ -81,6 +81,7 @@ PVS_LOG_OPTS = -a 'GA:1,2' -e -t errorfile -d $(PVS_IGNORE) TEST_PROGS = check_iolog_filter check_iolog_json check_iolog_mkpath check_iolog_path check_iolog_timing host_port_test TEST_LIBS = @LIBS@ TEST_LDFLAGS = @LDFLAGS@ +TEST_VERBOSE = # Fuzzers LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la @@ -339,6 +340,9 @@ check: $(TEST_PROGS) check-fuzzer exit $$rval; \ fi +check-verbose: + exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \ *.lo *.o *.la diff --git a/lib/logsrv/Makefile.in b/lib/logsrv/Makefile.in index 58378c8af..1b173a5d9 100644 --- a/lib/logsrv/Makefile.in +++ b/lib/logsrv/Makefile.in @@ -157,6 +157,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -rm -f *.i *.plog stamp-* core *.core core.* diff --git a/lib/protobuf-c/Makefile.in b/lib/protobuf-c/Makefile.in index f3a2d0526..6c6315291 100644 --- a/lib/protobuf-c/Makefile.in +++ b/lib/protobuf-c/Makefile.in @@ -152,6 +152,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -rm -f *.i *.plog stamp-* core *.core core.* diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 8a6208b3d..cecadf503 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -116,6 +116,8 @@ TEST_PROGS = conf_test hltq_test parseln_test progname_test \ uuid_test @COMPAT_TEST_PROGS@ TEST_LIBS = @LIBS@ TEST_LDFLAGS = @LDFLAGS@ +TEST_VERBOSE = +HARNESS = $(SHELL) regress/harness $(TEST_VERBOSE) # Fuzzers LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la @@ -460,11 +462,14 @@ check: $(TEST_PROGS) check-fuzzer rm -f ./progname_test2; ln -s ./progname_test ./progname_test2; \ ./progname_test2 || rval=`expr $$rval + $$?`; \ rm -f ./progname_test2; \ - AWK=$(AWK) $(SHELL) regress/harness sudo_conf || rval=`expr $$rval + $$?`; \ - AWK=$(AWK) $(SHELL) regress/harness sudo_parseln || rval=`expr $$rval + $$?`; \ + AWK=$(AWK) $(HARNESS) sudo_conf || rval=`expr $$rval + $$?`; \ + AWK=$(AWK) $(HARNESS) sudo_parseln || rval=`expr $$rval + $$?`; \ exit $$rval; \ fi +check-verbose: + exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \ *.lo *.o *.la diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in index f5860cd47..ebb98efe0 100644 --- a/lib/zlib/Makefile.in +++ b/lib/zlib/Makefile.in @@ -167,6 +167,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -rm -f stamp-* core *.core core.* diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index 3faa1587b..6ed19072e 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -257,6 +257,8 @@ check-fuzzer: $(FUZZ_PROGS) check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(FUZZ_PROGS) \ *.lo *.o *.la diff --git a/plugins/audit_json/Makefile.in b/plugins/audit_json/Makefile.in index 1e0f08e7b..0a2840415 100644 --- a/plugins/audit_json/Makefile.in +++ b/plugins/audit_json/Makefile.in @@ -187,6 +187,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la *.a *.i *.plog \ stamp-* core *.core core.* diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index 89974dd7e..e648dd88b 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -190,6 +190,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -rm -f *.i *.plog stamp-* core *.core core.* diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index 5d19baa03..c0d21e0d4 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -131,6 +131,7 @@ LIBOBJDIR = $(top_builddir)/@ac_config_libobj_dir@/ VERSION = @PACKAGE_VERSION@ TEST_PROGS = check_python_examples +TEST_VERBOSE = CHECK_PYTHON_EXAMPLES_OBJS = check_python_examples.o iohelpers.o testhelpers.o pyhelpers.o sudo_python_debug.o @@ -238,6 +239,9 @@ check: $(TEST_PROGS) check-fuzzer ./check_python_examples ".libs/python_plugin.so"; \ fi +check-verbose: + exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check + update_test_data: $(TEST_PROGS) @if test X"$(cross_compiling)" != X"yes"; then \ UPDATE_TESTDATA=1 ./check_python_examples ".libs/python_plugin.so"; \ diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index 7b27669c0..f16bf747b 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -185,6 +185,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -rm -f *.i *.plog stamp-* core *.core core.* diff --git a/plugins/sample_approval/Makefile.in b/plugins/sample_approval/Makefile.in index f7c4d6033..6f6456dcd 100644 --- a/plugins/sample_approval/Makefile.in +++ b/plugins/sample_approval/Makefile.in @@ -187,6 +187,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la *.a *.i *.plog \ stamp-* core *.core core.* diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 204540b89..317e6f3f0 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -160,6 +160,8 @@ TEST_PROGS = check_addr check_base64 check_digest check_editor \ check_env_pattern check_exptilde check_fill check_gentime \ check_hexchar check_iolog_plugin check_serialize_list \ check_starttime check_unesc @SUDOERS_TEST_PROGS@ +TEST_VERBOSE = +HARNESS = $(SHELL) regress/harness $(TEST_VERBOSE) # Fuzzers LIB_FUZZING_ENGINE = @FUZZ_ENGINE@ @@ -676,13 +678,16 @@ check: $(TEST_PROGS) visudo testsudoers cvtsudoers check-fuzzer if test -f check_symbols; then \ ./check_symbols .libs/sudoers.so $(shlib_exp) || rval=`expr $$rval + $$?`; \ fi; \ - AWK=$(AWK) $(SHELL) regress/harness sudoers || rval=`expr $$rval + $$?`; \ - AWK=$(AWK) $(SHELL) regress/harness testsudoers || rval=`expr $$rval + $$?`; \ - AWK=$(AWK) $(SHELL) regress/harness visudo || rval=`expr $$rval + $$?`; \ - AWK=$(AWK) $(SHELL) regress/harness cvtsudoers || rval=`expr $$rval + $$?`; \ + AWK=$(AWK) $(HARNESS) sudoers || rval=`expr $$rval + $$?`; \ + AWK=$(AWK) $(HARNESS) testsudoers || rval=`expr $$rval + $$?`; \ + AWK=$(AWK) $(HARNESS) visudo || rval=`expr $$rval + $$?`; \ + AWK=$(AWK) $(HARNESS) cvtsudoers || rval=`expr $$rval + $$?`; \ exit $$rval; \ fi +check-verbose: + exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \ $(FUZZ_PROGS) *.lo *.o *.la diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index bcace6c3f..4eaac7aa7 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -190,6 +190,8 @@ check-fuzzer: check: check-fuzzer +check-verbose: check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -rm -f *.i *.plog stamp-* core *.core core.* diff --git a/src/Makefile.in b/src/Makefile.in index 12f4e1be8..6708888e4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -129,6 +129,7 @@ RC_LINK=@RC_LINK@ TEST_PROGS = check_net_ifs check_noexec check_ttyname TEST_LIBS = @LIBS@ $(LT_LIBS) TEST_LDFLAGS = @LDFLAGS@ +TEST_VERBOSE = # Set to non-empty for development mode DEVEL = @DEVEL@ @@ -332,13 +333,16 @@ check: $(TEST_PROGS) check-fuzzer unset LANG || LANG=; \ MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \ MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \ - ./check_net_ifs; \ + ./check_net_ifs $(TEST_VERBOSE); \ if [ -f .libs/$(noexecfile) ]; then \ - ./check_noexec .libs/$(noexecfile); \ + ./check_noexec $(TEST_VERBOSE) .libs/$(noexecfile); \ fi; \ - ./check_ttyname; \ + ./check_ttyname $(TEST_VERBOSE); \ fi +check-verbose: + exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check + clean: -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \ *.lo *.o *.la