diff --git a/lib/eventlog/Makefile.in b/lib/eventlog/Makefile.in index 62869c6c8..8bfd95944 100644 --- a/lib/eventlog/Makefile.in +++ b/lib/eventlog/Makefile.in @@ -179,11 +179,11 @@ check: $(TEST_PROGS) check-fuzzer MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \ umask 022; \ rval=0; \ - ./check_parse_json $(srcdir)/regress/parse_json/*.in || rval=`expr $$rval + $$?`; \ - ./store_json_test $(srcdir)/regress/eventlog_store/*.json.in || rval=`expr $$rval + $$?`; \ - ./store_sudo_test $(srcdir)/regress/eventlog_store/*.json.in || rval=`expr $$rval + $$?`; \ + ./check_parse_json $(TEST_VERBOSE) $(srcdir)/regress/parse_json/*.in || rval=`expr $$rval + $$?`; \ + ./store_json_test $(TEST_VERBOSE) $(srcdir)/regress/eventlog_store/*.json.in || rval=`expr $$rval + $$?`; \ + ./store_sudo_test $(TEST_VERBOSE) $(srcdir)/regress/eventlog_store/*.json.in || rval=`expr $$rval + $$?`; \ mkdir -p regress/logwrap; \ - ./check_wrap $(srcdir)/regress/logwrap/check_wrap.in > regress/logwrap/check_wrap.out; \ + ./check_wrap $(TEST_VERBOSE) $(srcdir)/regress/logwrap/check_wrap.in > regress/logwrap/check_wrap.out; \ diff regress/logwrap/check_wrap.out $(srcdir)/regress/logwrap/check_wrap.out.ok || rval=`expr $$rval + $$?`; \ exit $$rval; \ fi diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in index d14372fa1..75dc53479 100644 --- a/lib/iolog/Makefile.in +++ b/lib/iolog/Makefile.in @@ -323,11 +323,11 @@ check: $(TEST_PROGS) check-fuzzer MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \ MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \ rval=0; \ - ./check_iolog_filter $(srcdir)/regress/iolog_filter/test[1-9]* || rval=`expr $$rval + $$?`; \ - ./check_iolog_path $(srcdir)/regress/iolog_path/data || rval=`expr $$rval + $$?`; \ - ./check_iolog_mkpath || rval=`expr $$rval + $$?`; \ - ./check_iolog_timing || rval=`expr $$rval + $$?`; \ - ./host_port_test || rval=`expr $$rval + $$?`; \ + ./check_iolog_filter $(TEST_VERBOSE) $(srcdir)/regress/iolog_filter/test[1-9]* || rval=`expr $$rval + $$?`; \ + ./check_iolog_path $(TEST_VERBOSE) $(srcdir)/regress/iolog_path/data || rval=`expr $$rval + $$?`; \ + ./check_iolog_mkpath $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./check_iolog_timing $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./host_port_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ exit $$rval; \ fi diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 4dba57292..112509378 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -453,11 +453,11 @@ check: $(TEST_PROGS) check-fuzzer MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \ rval=0; \ if test -f closefrom_test; then \ - ./closefrom_test || rval=`expr $$rval + $$?`; \ + ./closefrom_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ fi; \ - ./digest_test || rval=`expr $$rval + $$?`; \ + ./digest_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ if test -f fnm_test; then \ - ./fnm_test $(srcdir)/regress/fnmatch/fnm_test.in || rval=`expr $$rval + $$?`; \ + ./fnm_test $(TEST_VERBOSE) $(srcdir)/regress/fnmatch/fnm_test.in || rval=`expr $$rval + $$?`; \ fi; \ if test -f globtest; then \ mkdir -p `$(SED) 's@/[^/]*$$@@' $(srcdir)/regress/glob/files | sort -u`; \ @@ -465,36 +465,36 @@ check: $(TEST_PROGS) check-fuzzer chmod 0755 `$(EGREP) '/r[^/]*$$' $(srcdir)/regress/glob/files`; \ chmod 0444 `$(EGREP) '/s[^/]*$$' $(srcdir)/regress/glob/files`; \ chmod 0711 `$(EGREP) '/t[^/]*$$' $(srcdir)/regress/glob/files`; \ - ./globtest $(srcdir)/regress/glob/globtest.in || rval=`expr $$rval + $$?`; \ + ./globtest $(TEST_VERBOSE) $(srcdir)/regress/glob/globtest.in || rval=`expr $$rval + $$?`; \ rm -rf fake; \ fi; \ if test -f getdelim_test; then \ - ./getdelim_test || rval=`expr $$rval + $$?`; \ + ./getdelim_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ fi; \ if test -f mktemp_test; then \ - ./mktemp_test || rval=`expr $$rval + $$?`; \ + ./mktemp_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ fi; \ if test -f strsig_test; then \ - ./strsig_test || rval=`expr $$rval + $$?`; \ + ./strsig_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ fi; \ - ./getgrouplist_test || rval=`expr $$rval + $$?`; \ - ./hexchar_test || rval=`expr $$rval + $$?`; \ - ./hltq_test || rval=`expr $$rval + $$?`; \ - ./json_test || rval=`expr $$rval + $$?`; \ - ./multiarch_test || rval=`expr $$rval + $$?`; \ - ./open_parent_dir_test || rval=`expr $$rval + $$?`; \ - ./parse_gids_test || rval=`expr $$rval + $$?`; \ - ./progname_test || rval=`expr $$rval + $$?`; \ - rm -f ./progname_test2; ln -s ./progname_test ./progname_test2; \ - ./progname_test2 || rval=`expr $$rval + $$?`; \ + ./getgrouplist_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./hexchar_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./hltq_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./json_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./multiarch_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./open_parent_dir_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./parse_gids_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./progname_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + rm -f ./progname_test2 $(TEST_VERBOSE); ln -s ./progname_test ./progname_test2; \ + ./progname_test2 $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ rm -f ./progname_test2; \ - ./regex_test || rval=`expr $$rval + $$?`; \ - ./strsplit_test || rval=`expr $$rval + $$?`; \ - ./strtobool_test || rval=`expr $$rval + $$?`; \ - ./strtoid_test || rval=`expr $$rval + $$?`; \ - ./strtomode_test || rval=`expr $$rval + $$?`; \ - ./strtonum_test || rval=`expr $$rval + $$?`; \ - ./uuid_test || rval=`expr $$rval + $$?`; \ + ./regex_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./strsplit_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./strtobool_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./strtoid_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./strtomode_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./strtonum_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./uuid_test $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) sudo_conf || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) sudo_parseln || rval=`expr $$rval + $$?`; \ exit $$rval; \ diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index 818f37c87..423aed4b7 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -238,7 +238,8 @@ check: $(TEST_PROGS) check-fuzzer MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \ MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \ LSAN_OPTIONS=suppressions=$(srcdir)/lsan_suppr.txt \ - ./check_python_examples ".libs/python_plugin.so"; \ + ./check_python_examples $(TEST_VERBOSE) \ + ".libs/python_plugin.so"; \ fi check-verbose: diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 2e9d9fd9b..8c3f1b80d 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -652,24 +652,24 @@ check: $(TEST_PROGS) visudo testsudoers cvtsudoers check-fuzzer umask 022; \ rval=0; \ mkdir -p regress/parser; \ - ./check_addr $(srcdir)/regress/parser/check_addr.in || rval=`expr $$rval + $$?`; \ - ./check_base64 || rval=`expr $$rval + $$?`; \ + ./check_addr $(TEST_VERBOSE) $(srcdir)/regress/parser/check_addr.in || rval=`expr $$rval + $$?`; \ + ./check_base64 $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ if test -f check_digest; then \ - ./check_digest > regress/parser/check_digest.out; \ + ./check_digest $(TEST_VERBOSE) > regress/parser/check_digest.out; \ diff regress/parser/check_digest.out $(srcdir)/regress/parser/check_digest.out.ok || rval=`expr $$rval + $$?`; \ fi; \ - ./check_editor || rval=`expr $$rval + $$?`; \ - ./check_env_pattern $(srcdir)/regress/env_match/data || rval=`expr $$rval + $$?`; \ - ./check_exptilde || rval=`expr $$rval + $$?`; \ - ./check_fill || rval=`expr $$rval + $$?`; \ - ./check_gentime || rval=`expr $$rval + $$?`; \ + ./check_editor $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./check_env_pattern $(TEST_VERBOSE) $(srcdir)/regress/env_match/data || rval=`expr $$rval + $$?`; \ + ./check_exptilde $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./check_fill $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./check_gentime $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ mkdir -p regress/iolog_plugin; \ - ./check_iolog_plugin regress/iolog_plugin/iolog || rval=`expr $$rval + $$?`; \ - ./check_serialize_list || rval=`expr $$rval + $$?`; \ - ./check_starttime || rval=`expr $$rval + $$?`; \ - ./check_unesc || rval=`expr $$rval + $$?`; \ + ./check_iolog_plugin $(TEST_VERBOSE) regress/iolog_plugin/iolog || rval=`expr $$rval + $$?`; \ + ./check_serialize_list $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./check_starttime $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ + ./check_unesc $(TEST_VERBOSE) || rval=`expr $$rval + $$?`; \ if test -f check_symbols; then \ - ./check_symbols .libs/sudoers.so $(shlib_exp) || rval=`expr $$rval + $$?`; \ + ./check_symbols $(TEST_VERBOSE) .libs/sudoers.so $(shlib_exp) || rval=`expr $$rval + $$?`; \ fi; \ AWK=$(AWK) $(HARNESS) sudoers || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) testsudoers || rval=`expr $$rval + $$?`; \