diff options
| -rw-r--r-- | regress/sys/kern/mount/Makefile | 13 | ||||
| -rw-r--r-- | regress/usr.bin/lastcomm/Makefile | 16 | ||||
| -rw-r--r-- | regress/usr.sbin/switchd/Makefile | 9 |
3 files changed, 9 insertions, 29 deletions
diff --git a/regress/sys/kern/mount/Makefile b/regress/sys/kern/mount/Makefile index db8fd3bd980..b6a43775450 100644 --- a/regress/sys/kern/mount/Makefile +++ b/regress/sys/kern/mount/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2020/05/25 11:08:12 bluhm Exp $ +# $OpenBSD: Makefile,v 1.8 2020/12/16 23:10:48 bluhm Exp $ # This regress test uses a vnd device to run mount and unmount. # All tests have to be run as root. @@ -8,7 +8,6 @@ CLEANFILES= diskimage *.log .PHONY: disk mount unconfig clean disk: unconfig - @echo '======== $@ ========' dd if=/dev/null of=diskimage bs=1m seek=1100 vnconfig vnd0 diskimage disklabel -wA -T ${.CURDIR}/disktemplate vnd0 @@ -17,13 +16,11 @@ disk: unconfig [ `disklabel vnd0 | grep -c '\<4.2BSD\>'` -eq 15 ] mount: disk - @echo '======== $@ ========' newfs vnd0a mkdir -p /mnt/regress-mount mount /dev/vnd0a /mnt/regress-mount mount-nested: mount - @echo '======== $@ ========' .for p in b d e f g h i j k l m n o p newfs -O 1 vnd0${p} .endfor @@ -34,14 +31,12 @@ mount-nested: mount mount [ `mount | grep -c '/dev/vnd0. on /mnt/regress-mount\>'` -eq 15 ] +REGRESS_CLEANUP = unconfig unconfig: - @echo '======== $@ ========' -umount -f /dev/vnd0a 2>/dev/null || true -rmdir /mnt/regress-mount 2>/dev/null || true -vnconfig -u vnd0 2>/dev/null || true -REGRESS_CLEANUP = unconfig - # The unmount-nested test uses a disk template to create 15 partitions # on a vnd device. All are initialized with a ffs file system. # Then they are mounted nestedly in /mnt, see disktemplate for the @@ -52,7 +47,6 @@ REGRESS_CLEANUP = unconfig REGRESS_TARGETS+= run-unmount-nested run-unmount-nested: mount-nested - @echo '\n======== $@ ========' ! umount /mnt/regress-mount umount -f /mnt/regress-mount mount @@ -65,7 +59,6 @@ run-unmount-nested: mount-nested REGRESS_TARGETS+= run-unmount-busy run-unmount-busy: mount - @echo '\n======== $@ ========' cp -r /usr /mnt/regress-mount & sleep 5 sync @@ -93,7 +86,6 @@ run-readonly-busy run-readonly-dangling: REGRESS_TARGETS+= run-readonly-busy run-readonly-busy: mount - @echo '\n======== $@ ========' cp -r /usr /mnt/regress-mount & sleep 5 sync @@ -119,7 +111,6 @@ run-readonly-busy: mount REGRESS_TARGETS+= run-readonly-dangling run-readonly-dangling: mount - @echo '\n======== $@ ========' touch /mnt/regress-mount/file sleep 73 </mnt/regress-mount/file & sleep .1 diff --git a/regress/usr.bin/lastcomm/Makefile b/regress/usr.bin/lastcomm/Makefile index c3617547a72..a91b745311b 100644 --- a/regress/usr.bin/lastcomm/Makefile +++ b/regress/usr.bin/lastcomm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2020/12/14 11:10:02 bluhm Exp $ +# $OpenBSD: Makefile,v 1.9 2020/12/16 23:10:48 bluhm Exp $ # Start with a clean /var/account/acct accounting file and turn on # process accounting with accton(8). Each test executes a command @@ -25,10 +25,11 @@ WARNINGS= Yes LDADD_syscallwx= -z wxneeded CLEANFILES= regress-* +REGRESS_SETUP = ${PROGS} + REGRESS_SETUP_ONCE = setup-rotate # Rotate accouting files and keep statistics, from /etc/daily. setup-rotate: - @echo '\n======== $@ ========' ${SUDO} touch /var/account/acct -${SUDO} mv -f /var/account/acct.2 /var/account/acct.3 -${SUDO} mv -f /var/account/acct.1 /var/account/acct.2 @@ -39,7 +40,6 @@ setup-rotate: REGRESS_TARGETS += run-fork run-fork: - @echo '\n======== $@ ========' # Create shell program, fork a sub shell, and check the -F flag. cp -f /bin/sh regress-fork ./regress-fork -c '( : ) &' @@ -47,7 +47,6 @@ run-fork: REGRESS_TARGETS += run-trapstack run-trapstack: trapstack - @echo '\n======== $@ ========' # Use invalid stack pointer, trap, SIGSEGV handler, check -M flag. cp -f trapstack regress-trapstack ./regress-trapstack @@ -55,7 +54,6 @@ run-trapstack: trapstack REGRESS_TARGETS += run-callstack run-callstack: callstack - @echo '\n======== $@ ========' # Use invalid stack pointer, syscall, SIGSEGV handler, check -M flag. cp -f callstack regress-callstack ./regress-callstack @@ -63,7 +61,6 @@ run-callstack: callstack REGRESS_TARGETS += run-syscallwx run-syscallwx: syscallwx - @echo '\n======== $@ ========' # Use writable syscall code, run SIGSEGV handler, check -M flag. cp -f syscallwx regress-syscallwx ./regress-syscallwx @@ -71,7 +68,6 @@ run-syscallwx: syscallwx REGRESS_TARGETS += run-core run-core: - @echo '\n======== $@ ========' # Create shell program, abort sub shell, and check the -DX flag. cp -f /bin/sh regress-core rm -f regress-core.core @@ -80,7 +76,6 @@ run-core: REGRESS_TARGETS += run-xsig run-xsig: - @echo '\n======== $@ ========' # Create shell program, kill sub shell, and check the -X flag. cp -f /bin/sh regress-xsig ./regress-xsig -c '( : ) & kill -KILL $$!; wait' @@ -88,7 +83,6 @@ run-xsig: REGRESS_TARGETS += run-pledge run-pledge: - @echo '\n======== $@ ========' # Create perl program, violate pledge, and check the -P flag. cp -f /usr/bin/perl regress-pledge ulimit -c 0; ! ./regress-pledge -MOpenBSD::Pledge -e\ @@ -97,7 +91,6 @@ run-pledge: REGRESS_TARGETS += run-unveil run-unveil: unveil - @echo '\n======== $@ ========' # Attempt to open veiled file, check -U flag. cp -f unveil regress-unveil ./regress-unveil @@ -105,12 +98,9 @@ run-unveil: unveil REGRESS_TARGETS += run-trap run-trap: crash - @echo '\n======== $@ ========' # Build crashing program, run SIGSEGV handler, and check the -T flag. cp -f crash regress-trap ./regress-trap lastcomm regress-trap | grep -q ' -T ' -${REGRESS_TARGETS}: ${PROGS} - .include <bsd.regress.mk> diff --git a/regress/usr.sbin/switchd/Makefile b/regress/usr.sbin/switchd/Makefile index 1b23489e49a..d0fc7b78c53 100644 --- a/regress/usr.sbin/switchd/Makefile +++ b/regress/usr.sbin/switchd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/07/12 19:31:29 bluhm Exp $ +# $OpenBSD: Makefile,v 1.10 2020/12/16 23:10:48 bluhm Exp $ # The following ports must be installed for the regression tests: # p5-Net-Pcap Perl interface for libpcap @@ -47,12 +47,11 @@ PERLPATH = ${.CURDIR}/ .for a in ${ARGS} REGRESS_TARGETS += run-$a run-$a: $a - @echo '\n======== $@ ========' - time SUDO=${SUDO} KTRACE=${KTRACE} SWITCHD=${SWITCHD} perl ${PERLINC} ${PERLPATH}run.pl ${PERLPATH}$a + time SUDO=${SUDO} KTRACE=${KTRACE} SWITCHD=${SWITCHD} \ + perl ${PERLINC} ${PERLPATH}run.pl ${PERLPATH}$a .endfor ${OFP_HEADERS}: - @echo '\n======== setup-$@ ========' .for p in ${SRC_PATH} ${SYS_PATH} ! test -s $p/$@ || grep -v '^#include' $p/$@ >$@ .endfor @@ -61,7 +60,7 @@ ${OFP_HEADERS}: .h.ph: @h2ph -d ${.OBJDIR} $< -${REGRESS_TARGETS:M*}: ${OFP_PERLHEADERS} +REGRESS_SETUP = ${OFP_PERLHEADERS} # make perl syntax check for all args files |