isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check-verbose Makefile target that runs tests in verbose mode.

Browse Source
This commit is contained in:
Todd C. Miller
2022-03-02 13:32:08 -07:00
parent 43cc80d795
commit cdee5d48da
20 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@@ -110,7 +110,7 @@ all: config.status
exit $$?; \ exit $$?; \
done done
check check-fuzzer fuzz pre-install: config.status check check-verbose check-fuzzer fuzz pre-install: config.status
for d in $(SUBDIRS); do \ for d in $(SUBDIRS); do \
(cd $$d && exec $(MAKE) $@) && continue; \ (cd $$d && exec $(MAKE) $@) && continue; \
exit $$?; \ exit $$?; \
@@ -146,7 +146,7 @@ splint: config.status
cov-build: cov-build:
make clean make clean
cov-build --dir cov-int make ${MFLAGS} all cov-build --dir cov-int make $(MFLAGS) all
cov-upload: cov-upload:
tar zcf cov-int.tgz cov-int tar zcf cov-int.tgz cov-int

2
docs/Makefile.in
View File

@@ -414,6 +414,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-rm -f fixman.sed -rm -f fixman.sed

2
examples/Makefile.in
View File

@@ -119,6 +119,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
mostlyclean: clean mostlyclean: clean

2
include/Makefile.in
View File

@@ -96,6 +96,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
mostlyclean: clean mostlyclean: clean

4
lib/eventlog/Makefile.in
View File

@@ -81,6 +81,7 @@ DEVEL = @DEVEL@
SHELL = @SHELL@ SHELL = @SHELL@
TEST_PROGS = check_wrap TEST_PROGS = check_wrap
TEST_VERBOSE =
LIBEVENTLOG_OBJS = eventlog.lo eventlog_conf.lo eventlog_free.lo logwrap.lo LIBEVENTLOG_OBJS = eventlog.lo eventlog_conf.lo eventlog_free.lo logwrap.lo
@@ -168,6 +169,9 @@ check: $(TEST_PROGS) check-fuzzer
exit $$rval; \ exit $$rval; \
fi fi
check-verbose:
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la $(TEST_PROGS) -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la $(TEST_PROGS)
-rm -f *.i *.plog stamp-* core *.core core.* regress/*/*.out -rm -f *.i *.plog stamp-* core *.core core.* regress/*/*.out

2
lib/fuzzstub/Makefile.in
View File

@@ -145,6 +145,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la
-rm -f *.i *.plog stamp-* core *.core core.* -rm -f *.i *.plog stamp-* core *.core core.*

4
lib/iolog/Makefile.in
View File

@@ -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_PROGS = check_iolog_filter check_iolog_json check_iolog_mkpath check_iolog_path check_iolog_timing host_port_test
TEST_LIBS = @LIBS@ TEST_LIBS = @LIBS@
TEST_LDFLAGS = @LDFLAGS@ TEST_LDFLAGS = @LDFLAGS@
TEST_VERBOSE =
# Fuzzers # Fuzzers
LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la
@@ -339,6 +340,9 @@ check: $(TEST_PROGS) check-fuzzer
exit $$rval; \ exit $$rval; \
fi fi
check-verbose:
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \ -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \
*.lo *.o *.la *.lo *.o *.la

2
lib/logsrv/Makefile.in
View File

@@ -157,6 +157,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la
-rm -f *.i *.plog stamp-* core *.core core.* -rm -f *.i *.plog stamp-* core *.core core.*

2
lib/protobuf-c/Makefile.in
View File

@@ -152,6 +152,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la
-rm -f *.i *.plog stamp-* core *.core core.* -rm -f *.i *.plog stamp-* core *.core core.*

9
lib/util/Makefile.in
View File

@@ -116,6 +116,8 @@ TEST_PROGS = conf_test hltq_test parseln_test progname_test \
uuid_test @COMPAT_TEST_PROGS@ uuid_test @COMPAT_TEST_PROGS@
TEST_LIBS = @LIBS@ TEST_LIBS = @LIBS@
TEST_LDFLAGS = @LDFLAGS@ TEST_LDFLAGS = @LDFLAGS@
TEST_VERBOSE =
HARNESS = $(SHELL) regress/harness $(TEST_VERBOSE)
# Fuzzers # Fuzzers
LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la 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; \ rm -f ./progname_test2; ln -s ./progname_test ./progname_test2; \
./progname_test2 || rval=`expr $$rval + $$?`; \ ./progname_test2 || rval=`expr $$rval + $$?`; \
rm -f ./progname_test2; \ rm -f ./progname_test2; \
AWK=$(AWK) $(SHELL) regress/harness sudo_conf || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) sudo_conf || rval=`expr $$rval + $$?`; \
AWK=$(AWK) $(SHELL) regress/harness sudo_parseln || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) sudo_parseln || rval=`expr $$rval + $$?`; \
exit $$rval; \ exit $$rval; \
fi fi
check-verbose:
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \ -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(TEST_PROGS) $(FUZZ_PROGS) \
*.lo *.o *.la *.lo *.o *.la

2
lib/zlib/Makefile.in
View File

@@ -167,6 +167,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la
-rm -f stamp-* core *.core core.* -rm -f stamp-* core *.core core.*

2
logsrvd/Makefile.in
View File

@@ -257,6 +257,8 @@ check-fuzzer: $(FUZZ_PROGS)
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(FUZZ_PROGS) \ -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(FUZZ_PROGS) \
*.lo *.o *.la *.lo *.o *.la

2
plugins/audit_json/Makefile.in
View File

@@ -187,6 +187,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la *.a *.i *.plog \ -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la *.a *.i *.plog \
stamp-* core *.core core.* stamp-* core *.core core.*

2
plugins/group_file/Makefile.in
View File

@@ -190,6 +190,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la
-rm -f *.i *.plog stamp-* core *.core core.* -rm -f *.i *.plog stamp-* core *.core core.*

4
plugins/python/Makefile.in
View File

@@ -131,6 +131,7 @@ LIBOBJDIR = $(top_builddir)/@ac_config_libobj_dir@/
VERSION = @PACKAGE_VERSION@ VERSION = @PACKAGE_VERSION@
TEST_PROGS = check_python_examples 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 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"; \ ./check_python_examples ".libs/python_plugin.so"; \
fi fi
check-verbose:
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
update_test_data: $(TEST_PROGS) update_test_data: $(TEST_PROGS)
@if test X"$(cross_compiling)" != X"yes"; then \ @if test X"$(cross_compiling)" != X"yes"; then \
UPDATE_TESTDATA=1 ./check_python_examples ".libs/python_plugin.so"; \ UPDATE_TESTDATA=1 ./check_python_examples ".libs/python_plugin.so"; \

2
plugins/sample/Makefile.in
View File

@@ -185,6 +185,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la
-rm -f *.i *.plog stamp-* core *.core core.* -rm -f *.i *.plog stamp-* core *.core core.*

2
plugins/sample_approval/Makefile.in
View File

@@ -187,6 +187,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la *.a *.i *.plog \ -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la *.a *.i *.plog \
stamp-* core *.core core.* stamp-* core *.core core.*

13
plugins/sudoers/Makefile.in
View File

@@ -160,6 +160,8 @@ TEST_PROGS = check_addr check_base64 check_digest check_editor \
check_env_pattern check_exptilde check_fill check_gentime \ check_env_pattern check_exptilde check_fill check_gentime \
check_hexchar check_iolog_plugin check_serialize_list \ check_hexchar check_iolog_plugin check_serialize_list \
check_starttime check_unesc @SUDOERS_TEST_PROGS@ check_starttime check_unesc @SUDOERS_TEST_PROGS@
TEST_VERBOSE =
HARNESS = $(SHELL) regress/harness $(TEST_VERBOSE)
# Fuzzers # Fuzzers
LIB_FUZZING_ENGINE = @FUZZ_ENGINE@ LIB_FUZZING_ENGINE = @FUZZ_ENGINE@
@@ -676,13 +678,16 @@ check: $(TEST_PROGS) visudo testsudoers cvtsudoers check-fuzzer
if test -f check_symbols; then \ if test -f check_symbols; then \
./check_symbols .libs/sudoers.so $(shlib_exp) || rval=`expr $$rval + $$?`; \ ./check_symbols .libs/sudoers.so $(shlib_exp) || rval=`expr $$rval + $$?`; \
fi; \ fi; \
AWK=$(AWK) $(SHELL) regress/harness sudoers || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) sudoers || rval=`expr $$rval + $$?`; \
AWK=$(AWK) $(SHELL) regress/harness testsudoers || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) testsudoers || rval=`expr $$rval + $$?`; \
AWK=$(AWK) $(SHELL) regress/harness visudo || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) visudo || rval=`expr $$rval + $$?`; \
AWK=$(AWK) $(SHELL) regress/harness cvtsudoers || rval=`expr $$rval + $$?`; \ AWK=$(AWK) $(HARNESS) cvtsudoers || rval=`expr $$rval + $$?`; \
exit $$rval; \ exit $$rval; \
fi fi
check-verbose:
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \ -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \
$(FUZZ_PROGS) *.lo *.o *.la $(FUZZ_PROGS) *.lo *.o *.la

2
plugins/system_group/Makefile.in
View File

@@ -190,6 +190,8 @@ check-fuzzer:
check: check-fuzzer check: check-fuzzer
check-verbose: check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f *.lo *.o *.la
-rm -f *.i *.plog stamp-* core *.core core.* -rm -f *.i *.plog stamp-* core *.core core.*

10
src/Makefile.in
View File

@@ -129,6 +129,7 @@ RC_LINK=@RC_LINK@
TEST_PROGS = check_net_ifs check_noexec check_ttyname TEST_PROGS = check_net_ifs check_noexec check_ttyname
TEST_LIBS = @LIBS@ $(LT_LIBS) TEST_LIBS = @LIBS@ $(LT_LIBS)
TEST_LDFLAGS = @LDFLAGS@ TEST_LDFLAGS = @LDFLAGS@
TEST_VERBOSE =
# Set to non-empty for development mode # Set to non-empty for development mode
DEVEL = @DEVEL@ DEVEL = @DEVEL@
@@ -332,13 +333,16 @@ check: $(TEST_PROGS) check-fuzzer
unset LANG || LANG=; \ unset LANG || LANG=; \
MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \ MALLOC_OPTIONS=S; export MALLOC_OPTIONS; \
MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \ MALLOC_CONF="abort:true,junk:true"; export MALLOC_CONF; \
./check_net_ifs; \ ./check_net_ifs $(TEST_VERBOSE); \
if [ -f .libs/$(noexecfile) ]; then \ if [ -f .libs/$(noexecfile) ]; then \
./check_noexec .libs/$(noexecfile); \ ./check_noexec $(TEST_VERBOSE) .libs/$(noexecfile); \
fi; \ fi; \
./check_ttyname; \ ./check_ttyname $(TEST_VERBOSE); \
fi fi
check-verbose:
exec $(MAKE) $(MFLAGS) TEST_VERBOSE=-v check
clean: clean:
-$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \ -$(LIBTOOL) $(LTFLAGS) --mode=clean rm -f $(PROGS) $(TEST_PROGS) \
*.lo *.o *.la *.lo *.o *.la