diff options
| author |   bluhm <bluhm@openbsd.org> | 2020-12-17 00:51:11 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2020-12-17 00:51:11 +0000 |
| commit | b5d99089c2c33aceeba7ec4dbfc362d61bc408ea (patch) | |
| tree | 886c9d4be21c610ca8c639f7364ec0880f98badf /regress/sys | |
| parent | Use setup and cleanup feature from regress framework. (diff) | |
| download | wireguard-openbsd-b5d99089c2c33aceeba7ec4dbfc362d61bc408ea.tar.xz wireguard-openbsd-b5d99089c2c33aceeba7ec4dbfc362d61bc408ea.zip | |
Remove echo headlines.
Diffstat (limited to 'regress/sys')
26 files changed, 26 insertions, 295 deletions
diff --git a/regress/sys/arch/amd64/fpu/Makefile b/regress/sys/arch/amd64/fpu/Makefile index 359b13ae031..a915755f3ed 100644 --- a/regress/sys/arch/amd64/fpu/Makefile +++ b/regress/sys/arch/amd64/fpu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2018/08/21 18:35:18 bluhm Exp $ +# $OpenBSD: Makefile,v 1.2 2020/12/17 00:51:12 bluhm Exp $ PROGS = fenv fdump fdfl feget fxproc0 SRCS_fenv = fenv.S @@ -16,7 +16,6 @@ ALLOWKMEM != sysctl -n kern.allowkmem REGRESS_TARGETS += run-regress-fenv run-regress-fenv: fenv fdump - @echo '\n======== $@ ========' .if ${MODEL:C/.*_AMD_Opteron_.*/opteron/} != opteron # Load FPU environment directly at _start and write it. # Read FPU environment and print it to stdout. @@ -29,14 +28,12 @@ run-regress-fenv: fenv fdump REGRESS_TARGETS += run-regress-fdfl run-regress-fdfl: fdfl - @echo '\n======== $@ ========' # Print default libm FPU environment to stdout. ./fdfl >fdfl.out diff ${.CURDIR}/fenv_t.ok fdfl.out REGRESS_TARGETS += run-regress-feget run-regress-feget: feget - @echo '\n======== $@ ========' .if ${MODEL:C/.*_AMD_Opteron_.*/opteron/} != opteron # Get FPU environment via libm and print it to stdout. ./feget >feget.out @@ -48,7 +45,6 @@ run-regress-feget: feget REGRESS_TARGETS += run-regress-fxproc0 run-regress-fxproc0: fxproc0 - @echo '\n======== $@ ========' .if ${ALLOWKMEM} # Read FPU storage area from proc0 via /dev/mem and print it to stdout. ${SUDO} ./fxproc0 >fxproc0.out diff --git a/regress/sys/kern/noexec/Makefile b/regress/sys/kern/noexec/Makefile index fbfb4d5d0a4..96103c332eb 100644 --- a/regress/sys/kern/noexec/Makefile +++ b/regress/sys/kern/noexec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2020/07/06 07:31:19 kettenis Exp $ +# $OpenBSD: Makefile,v 1.22 2020/12/17 00:51:12 bluhm Exp $ PROG= noexec SRCS= noexec.c testfly.S @@ -14,67 +14,51 @@ REGRESS_TARGETS= nxtext-mmap nxtext-mprotect \ .PHONY: ${REGRESS_TARGETS} nxtext-mmap: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -T -m nxtext-mprotect: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -T -p nxdata: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -D nxdata-mprotect: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -D -p nxdata-mmap: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -D -m nxbss: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -B nxbss-mmap: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -B -m nxbss-mprotect: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -B -p nxheap: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -H nxheap-mmap: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -H -m nxheap-mprotect: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -H -p nxstack: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -S nxstack-mmap: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -S -m nxstack-mprotect: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -S -p nxmmap: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -m nxmmap-mprotect: ${PROG} - @echo '\n====== $@ ======' ./${PROG} -m -p .if ${MACHINE} != "alpha" && \ diff --git a/regress/sys/kern/ptrace2/Makefile b/regress/sys/kern/ptrace2/Makefile index fad37b26cb6..5f8c6a6e00b 100644 --- a/regress/sys/kern/ptrace2/Makefile +++ b/regress/sys/kern/ptrace2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2020/02/28 12:48:30 mpi Exp $ +# $OpenBSD: Makefile,v 1.2 2020/12/17 00:51:12 bluhm Exp $ # Copyright (c) 2019 Moritz Buhl <openbsd@moritzbuhl.de> # Copyright (c) 2019 Alexander Bluhm <bluhm@openbsd.org> @@ -35,7 +35,6 @@ LDADD = -lpthread .for p in ${PROGS} run-$p: $p - @echo "\n======== $@ ========" ntests="`./$p -n`" && \ echo "1..$$ntests" && \ tnumbers="`jot -ns' ' - 1 $$ntests`" && \ diff --git a/regress/sys/kern/realpath-unmount/Makefile b/regress/sys/kern/realpath-unmount/Makefile index 45ea355f3c9..8159dc0f398 100644 --- a/regress/sys/kern/realpath-unmount/Makefile +++ b/regress/sys/kern/realpath-unmount/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2020/03/02 12:03:09 bluhm Exp $ +# $OpenBSD: Makefile,v 1.3 2020/12/17 00:51:12 bluhm Exp $ # Call realpath(3) in combination with chroot(2), chdir(2). # Use umount(8) to check that the mountpoint leaks no vnode. @@ -10,18 +10,15 @@ CLEANFILES= diskimage .PHONY: mount unconfig clean diskimage: unconfig - @echo '\n======== $@ ========' ${SUDO} dd if=/dev/zero of=diskimage bs=512 count=4k ${SUDO} vnconfig vnd0 diskimage ${SUDO} newfs vnd0c mount: diskimage - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath ${SUDO} mount /dev/vnd0c /mnt/regress-realpath unconfig: - @echo '\n======== $@ ========' -${SUDO} umount -f /dev/vnd0c 2>/dev/null || true -${SUDO} rmdir /mnt/regress-realpath 2>/dev/null || true -${SUDO} vnconfig -u vnd0 2>/dev/null || true @@ -33,56 +30,48 @@ REGRESS_TARGETS = REGRESS_TARGETS += run-chroot run-chroot: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath ${SUDO} ./realpath-chroot /mnt/regress-realpath / ${SUDO} umount /mnt/regress-realpath REGRESS_TARGETS += run-chroot-dir run-chroot-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath/foo ${SUDO} ./realpath-chroot /mnt/regress-realpath/foo / ${SUDO} umount /mnt/regress-realpath REGRESS_TARGETS += run-chroot-subdir run-chroot-subdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath/foo ${SUDO} ./realpath-chroot /mnt/regress-realpath /foo ${SUDO} umount /mnt/regress-realpath REGRESS_TARGETS += run-chroot-dir-subdir run-chroot-dir-subdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath/foo/bar ${SUDO} ./realpath-chroot /mnt/regress-realpath/foo /bar ${SUDO} umount /mnt/regress-realpath REGRESS_TARGETS += run-chdir run-chdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath ${SUDO} ./realpath-chdir /mnt/regress-realpath . ${SUDO} umount /mnt/regress-realpath REGRESS_TARGETS += run-chdir-dir run-chdir-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath/foo ${SUDO} ./realpath-chdir /mnt/regress-realpath/foo . ${SUDO} umount /mnt/regress-realpath REGRESS_TARGETS += run-chdir-subdir run-chdir-subdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath/foo ${SUDO} ./realpath-chdir /mnt/regress-realpath foo ${SUDO} umount /mnt/regress-realpath REGRESS_TARGETS += run-chdir-dir-subdir run-chdir-dir-subdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-realpath/foo/bar ${SUDO} ./realpath-chdir /mnt/regress-realpath/foo bar ${SUDO} umount /mnt/regress-realpath diff --git a/regress/sys/kern/signal/sigpthread/Makefile b/regress/sys/kern/signal/sigpthread/Makefile index 97adae5f337..d2f5b0265ae 100644 --- a/regress/sys/kern/signal/sigpthread/Makefile +++ b/regress/sys/kern/signal/sigpthread/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2020/09/16 14:02:24 mpi Exp $ +# $OpenBSD: Makefile,v 1.2 2020/12/17 00:51:12 bluhm Exp $ PROG = sigpthread WARNINGS = yes @@ -12,7 +12,6 @@ CLEANFILES += out REGRESS_TARGETS += run-block-thread-3-unblock-$t run-block-thread-3-unblock-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -25,7 +24,6 @@ run-block-thread-3-unblock-$t: REGRESS_TARGETS += run-block-thread-3-sleep-main-unblock-$t run-block-thread-3-sleep-main-unblock-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # suspend threads until signaled @@ -39,7 +37,6 @@ run-block-thread-3-sleep-main-unblock-$t: REGRESS_TARGETS += run-block-thread-3-unblock-$t-sleep-thread run-block-thread-3-sleep-thread-unblock-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -53,7 +50,6 @@ run-block-thread-3-sleep-thread-unblock-$t: REGRESS_TARGETS += run-block-thread-3-sleep-unblock-unblock-$t run-block-thread-3-sleep-unblock-unblock-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -67,7 +63,6 @@ run-block-thread-3-sleep-unblock-unblock-$t: REGRESS_TARGETS += run-block-thread-3-kill-$t-unblock-$t run-block-thread-3-kill-$t-unblock-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -80,7 +75,6 @@ run-block-thread-3-kill-$t-unblock-$t: REGRESS_TARGETS += run-block-thread-3-sleep-main-kill-$t-unblock-$t run-block-thread-3-sleep-main-kill-$t-unblock-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # suspend threads until signaled @@ -94,7 +88,6 @@ run-block-thread-3-sleep-main-kill-$t-unblock-$t: REGRESS_TARGETS += run-block-thread-3-kill-$t-sleep-thread-unblock-$t run-block-thread-3-kill-$t-sleep-thread-unblock-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -108,7 +101,6 @@ run-block-thread-3-kill-$t-sleep-thread-unblock-$t: REGRESS_TARGETS += run-block-thread-3-kill-$t-unblock-$t-sleep-unblock run-block-thread-3-kill-$t-unblock-$t-sleep-unblock: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -122,7 +114,6 @@ run-block-thread-3-kill-$t-unblock-$t-sleep-unblock: REGRESS_TARGETS += run-block-thread-3-kill-$t run-block-thread-3-kill-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -135,7 +126,6 @@ run-block-thread-3-kill-$t: REGRESS_TARGETS += run-block-thread-3-sleep-main-kill-$t run-block-thread-3-sleep-main-kill-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # suspend threads until signaled @@ -149,7 +139,6 @@ run-block-thread-3-sleep-main-kill-$t: REGRESS_TARGETS += run-block-thread-3-kill-$t-sleep-thread run-block-thread-3-kill-$t-sleep-thread: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -163,7 +152,6 @@ run-block-thread-3-kill-$t-sleep-thread: REGRESS_TARGETS += run-block-thread-3-kill-$t-sleep-unblock run-block-thread-3-kill-$t-sleep-unblock: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -179,7 +167,6 @@ run-block-thread-3-kill-$t-sleep-unblock: REGRESS_TARGETS += run-block-thread-3 run-block-thread-3: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -192,7 +179,6 @@ run-block-thread-3: REGRESS_TARGETS += run-block-thread-3-sleep-main run-block-thread-3-sleep-main: - @echo '\n======== $@ ========' # block signal # run 3 threads # suspend threads until signaled @@ -206,7 +192,6 @@ run-block-thread-3-sleep-main: REGRESS_TARGETS += run-block-thread-3-sleep-thread run-block-thread-3-sleep-thread: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -220,7 +205,6 @@ run-block-thread-3-sleep-thread: REGRESS_TARGETS += run-block-thread-3-sleep-unblock run-block-thread-3-sleep-unblock: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -238,7 +222,6 @@ run-block-thread-3-sleep-unblock: REGRESS_TARGETS += run-thread-3-kill-$t run-thread-3-kill-$t: - @echo '\n======== $@ ========' # run 3 threads # kill thread $t # handle signal @@ -249,7 +232,6 @@ run-thread-3-kill-$t: REGRESS_TARGETS += run-thread-3-sleep-main-kill-$t run-thread-3-sleep-main-kill-$t: - @echo '\n======== $@ ========' # run 3 threads # suspend threads until signaled # sleep in main thread, signal should be received while suspended @@ -261,7 +243,6 @@ run-thread-3-sleep-main-kill-$t: REGRESS_TARGETS += run-thread-3-kill-$t-sleep-thread run-thread-3-kill-$t-sleep-thread: - @echo '\n======== $@ ========' # run 3 threads # kill thread $t # sleep in threads, signal should be received while sleeping @@ -273,7 +254,6 @@ run-thread-3-kill-$t-sleep-thread: REGRESS_TARGETS += run-thread-3-kill-$t-sleep-unblock run-thread-3-kill-$t-sleep-unblock: - @echo '\n======== $@ ========' # run 3 threads # kill thread $t # handle signal @@ -287,7 +267,6 @@ run-thread-3-kill-$t-sleep-unblock: REGRESS_TARGETS += run-thread-3 run-thread-3: - @echo '\n======== $@ ========' # run 3 threads # kill process # handle signal @@ -298,7 +277,6 @@ run-thread-3: REGRESS_TARGETS += run-thread-3-sleep-main run-thread-3-sleep-main: - @echo '\n======== $@ ========' # block signal # run 3 threads # suspend threads until signaled @@ -311,7 +289,6 @@ run-thread-3-sleep-main: REGRESS_TARGETS += run-thread-3-sleep-thread run-thread-3-sleep-thread: - @echo '\n======== $@ ========' # run 3 threads # kill process # sleep in threads, signal should be received while sleeping @@ -323,7 +300,6 @@ run-thread-3-sleep-thread: REGRESS_TARGETS += run-thread-3-sleep-unblock run-thread-3-sleep-unblock: - @echo '\n======== $@ ========' # run 3 threads # kill process # handle signal @@ -339,7 +315,6 @@ run-thread-3-sleep-unblock: REGRESS_TARGETS += run-block-thread-3-waiter-$t run-block-thread-3-waiter-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -351,7 +326,6 @@ run-block-thread-3-waiter-$t: REGRESS_TARGETS += run-block-thread-3-sleep-main-waiter-$t run-block-thread-3-sleep-main-waiter-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # wait for signal in thread $t @@ -364,7 +338,6 @@ run-block-thread-3-sleep-main-waiter-$t: REGRESS_TARGETS += run-block-thread-3-waiter-$t-sleep-thread run-block-thread-3-sleep-thread-waiter-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill process @@ -377,7 +350,6 @@ run-block-thread-3-sleep-thread-waiter-$t: REGRESS_TARGETS += run-block-thread-3-kill-$t-waiter-$t run-block-thread-3-kill-$t-waiter-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -389,7 +361,6 @@ run-block-thread-3-kill-$t-waiter-$t: REGRESS_TARGETS += run-block-thread-3-sleep-main-kill-$t-waiter-$t run-block-thread-3-sleep-main-kill-$t-waiter-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # wait for signal in thread $t @@ -402,7 +373,6 @@ run-block-thread-3-sleep-main-kill-$t-waiter-$t: REGRESS_TARGETS += run-block-thread-3-kill-$t-sleep-thread-waiter-$t run-block-thread-3-kill-$t-sleep-thread-waiter-$t: - @echo '\n======== $@ ========' # block signal # run 3 threads # kill thread $t @@ -419,7 +389,6 @@ run-block-thread-3-kill-$t-sleep-thread-waiter-$t: REGRESS_TARGETS += run-block-thread-100-unblock-23 run-block-thread-100-unblock-23: - @echo '\n======== $@ ========' # block signal # run 100 threads # kill process @@ -432,7 +401,6 @@ run-block-thread-100-unblock-23: REGRESS_TARGETS += run-block-thread-100-waiter-42 run-block-thread-100-waiter-42: - @echo '\n======== $@ ========' # block signal # run 100 threads # kill process diff --git a/regress/sys/kern/sosplice/error/Makefile b/regress/sys/kern/sosplice/error/Makefile index 9f41be0534c..2b1cbe63e0b 100644 --- a/regress/sys/kern/sosplice/error/Makefile +++ b/regress/sys/kern/sosplice/error/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2019/07/12 19:31:29 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:12 bluhm Exp $ .include <bsd.regress.mk> @@ -7,7 +7,6 @@ .for a in ${ARGS} run-$a: $a - @echo '\n======== $@ ========' .if empty (REMOTE_SSH) time perl ${PERLINC} ${PERLPATH}error.pl ${PERLPATH}$a .else diff --git a/regress/sys/kern/sosplice/perf/Makefile b/regress/sys/kern/sosplice/perf/Makefile index 047d4075f99..0bbb7a9b30e 100644 --- a/regress/sys/kern/sosplice/perf/Makefile +++ b/regress/sys/kern/sosplice/perf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2019/07/12 19:31:29 bluhm Exp $ +# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:12 bluhm Exp $ PROG ?= relay CFLAGS += -Wall -Werror @@ -25,7 +25,6 @@ remote-setup: .for r in copy splice run-$p-$r: $r remote-setup - @echo '\n======== $@ ========' -pkill -x tcpbench .if empty (REMOTE_SSH) ./$r ${p:S/tcp//:S/udp/-u/} -4 12345 127.0.0.1 12346 & \ diff --git a/regress/sys/kern/sosplice/scapy/Makefile b/regress/sys/kern/sosplice/scapy/Makefile index b15216b3ccc..0981c1af603 100644 --- a/regress/sys/kern/sosplice/scapy/Makefile +++ b/regress/sys/kern/sosplice/scapy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2020/01/15 20:47:13 bluhm Exp $ +# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:12 bluhm Exp $ # Copyright (c) 2017-2020 Alexander Bluhm <bluhm@openbsd.org> # @@ -124,14 +124,12 @@ SCAPYPATH = ${.CURDIR}/ .for s in ${SCAPYS} REGRESS_TARGETS += run-$s run-$s: $s addr.py - @echo '\n======== $@ ========' time SUDO=${SUDO} PYTHON="${PYTHON}" perl ${PERLINC} ${PERLPATH}scapy.pl splice ${FAKE_NET_ADDR} ${REMOTE_ADDR} ${REMOTE_SSH} ${SCAPYPATH}$s .endfor .if ! empty(PF_ANCHOR:Mregress) REGRESS_CLEANUP += cleanup cleanup: - @echo '\n======== $@ ========' ${SUDO} pfctl -a regress -Fr rm -f stamp-pfctl .endif diff --git a/regress/sys/kern/sosplice/tcp/Makefile b/regress/sys/kern/sosplice/tcp/Makefile index 80474fb58a9..0b77185203c 100644 --- a/regress/sys/kern/sosplice/tcp/Makefile +++ b/regress/sys/kern/sosplice/tcp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2019/07/12 19:31:29 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:12 bluhm Exp $ .include <bsd.regress.mk> @@ -13,7 +13,6 @@ .for a in ${ARGS} run-$a: $a - @echo '\n======== $@ ========' .if empty (REMOTE_SSH) time perl ${PERLINC} ${PERLPATH}relay.pl copy ${PERLPATH}$a time perl ${PERLINC} ${PERLPATH}relay.pl splice ${PERLPATH}$a diff --git a/regress/sys/kern/sosplice/udp/Makefile b/regress/sys/kern/sosplice/udp/Makefile index c83a8719491..c041f64e63c 100644 --- a/regress/sys/kern/sosplice/udp/Makefile +++ b/regress/sys/kern/sosplice/udp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2019/07/12 19:31:29 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:12 bluhm Exp $ .include <bsd.regress.mk> @@ -12,7 +12,6 @@ .for a in ${ARGS} run-$a: $a - @echo '\n======== $@ ========' .if empty (REMOTE_SSH) time perl ${PERLINC} ${PERLPATH}relay.pl copy ${PERLPATH}$a time perl ${PERLINC} ${PERLPATH}relay.pl splice ${PERLPATH}$a diff --git a/regress/sys/kern/unveil-unmount/Makefile b/regress/sys/kern/unveil-unmount/Makefile index 347e06cc409..59da3662d8e 100644 --- a/regress/sys/kern/unveil-unmount/Makefile +++ b/regress/sys/kern/unveil-unmount/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2019/08/06 11:38:16 bluhm Exp $ +# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:12 bluhm Exp $ # Call unveil(2) in combination with unlink(2), chroot(2), chdir(2). # Use umount(8) to check that the mountpoint leaks no vnode. @@ -10,18 +10,15 @@ CLEANFILES= diskimage .PHONY: mount unconfig clean diskimage: unconfig - @echo '\n======== $@ ========' ${SUDO} dd if=/dev/zero of=diskimage bs=512 count=4k ${SUDO} vnconfig vnd0 diskimage ${SUDO} newfs vnd0c mount: diskimage - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} mount /dev/vnd0c /mnt/regress-unveil unconfig: - @echo '\n======== $@ ========' -${SUDO} umount -f /dev/vnd0c 2>/dev/null || true -${SUDO} rmdir /mnt/regress-unveil 2>/dev/null || true -${SUDO} vnconfig -u vnd0 2>/dev/null || true @@ -33,49 +30,42 @@ REGRESS_TARGETS = REGRESS_TARGETS += run-unlink run-unlink: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-unlink /mnt/regress-unveil/foo bar ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chroot run-chroot: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} ./unveil-chroot /mnt/regress-unveil / ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chroot-dir run-chroot-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-chroot /mnt/regress-unveil/foo / ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chroot-unveil-dir run-chroot-unveil-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-chroot /mnt/regress-unveil /foo ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chroot-dir-unveil-dir run-chroot-dir-unveil-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} ./unveil-chroot /mnt/regress-unveil/foo /bar ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chroot-rootslash run-chroot-rootslash: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} ./unveil-chroot /mnt/regress-unveil // ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chroot-open run-chroot-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil / /baz @@ -83,7 +73,6 @@ run-chroot-open: REGRESS_TARGETS += run-chroot-dir-open run-chroot-dir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil/foo / /baz @@ -91,7 +80,6 @@ run-chroot-dir-open: REGRESS_TARGETS += run-chroot-unveil-dir-open run-chroot-unveil-dir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil /foo /baz @@ -99,7 +87,6 @@ run-chroot-unveil-dir-open: REGRESS_TARGETS += run-chroot-dir-unveil-dir-open run-chroot-dir-unveil-dir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} touch /mnt/regress-unveil/foo/bar/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil/foo /bar /baz @@ -107,7 +94,6 @@ run-chroot-dir-unveil-dir-open: REGRESS_TARGETS += run-chroot-rootslash-open run-chroot-rootslash-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil // /baz @@ -115,7 +101,6 @@ run-chroot-rootslash-open: REGRESS_TARGETS += run-chroot-open-rootslash run-chroot-open-rootslash: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil / //baz @@ -123,7 +108,6 @@ run-chroot-open-rootslash: REGRESS_TARGETS += run-chroot-unveil-rootdot-open run-chroot-unveil-rootdotdot-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil /. /baz @@ -131,7 +115,6 @@ run-chroot-unveil-rootdotdot-open: REGRESS_TARGETS += run-chroot-unveil-rootdotdot-open run-chroot-unveil-rootdotdot-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chroot /mnt/regress-unveil /.. /baz @@ -139,21 +122,18 @@ run-chroot-unveil-rootdotdot-open: REGRESS_TARGETS += run-perm run-perm: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} ./unveil-perm "" /mnt/regress-unveil ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-perm-dir run-perm-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-perm "" /mnt/regress-unveil/foo ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-perm-open run-perm-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-perm "" /mnt/regress-unveil baz @@ -161,7 +141,6 @@ run-perm-open: REGRESS_TARGETS += run-perm-dir-open run-perm-dir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-perm "" /mnt/regress-unveil/foo baz @@ -169,7 +148,6 @@ run-perm-dir-open: REGRESS_TARGETS += run-perm-create-open run-perm-create-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-perm "c" /mnt/regress-unveil baz @@ -177,7 +155,6 @@ run-perm-create-open: REGRESS_TARGETS += run-perm-dir-create-open run-perm-dir-create-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-perm "c" /mnt/regress-unveil/foo baz @@ -185,7 +162,6 @@ run-perm-dir-create-open: REGRESS_TARGETS += run-perm-write-open run-perm-write-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-perm "w" /mnt/regress-unveil baz @@ -193,7 +169,6 @@ run-perm-write-open: REGRESS_TARGETS += run-perm-dir-write-open run-perm-dir-write-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-perm "w" /mnt/regress-unveil/foo baz @@ -201,63 +176,54 @@ run-perm-dir-write-open: REGRESS_TARGETS += run-chdir run-chdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} ./unveil-chdir /mnt/regress-unveil . ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-dir run-chdir-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo . ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-unveil-dir run-chdir-unveil-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-chdir /mnt/regress-unveil foo ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-unveil-backdir run-chdir-unveil-backdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-chdir /mnt/regress-unveil foo/.. ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-unveil-dotdot run-chdir-unveil-dotdot: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo .. ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-dir-unveil-dir run-chdir-dir-unveil-dir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo bar ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-dir-unveil-backdir run-chdir-dir-unveil-backdir: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo bar/.. ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-dir-unveil-dotdot run-chdir-dir-unveil-dotdot: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo/bar .. ${SUDO} umount /mnt/regress-unveil REGRESS_TARGETS += run-chdir-open run-chdir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil . baz @@ -265,7 +231,6 @@ run-chdir-open: REGRESS_TARGETS += run-chdir-dir-open run-chdir-dir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo . baz @@ -273,7 +238,6 @@ run-chdir-dir-open: REGRESS_TARGETS += run-chdir-unveil-dir-open run-chdir-unveil-dir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil foo baz @@ -281,7 +245,6 @@ run-chdir-unveil-dir-open: REGRESS_TARGETS += run-chdir-unveil-backdir-open run-chdir-unveil-backdir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil foo/.. baz @@ -289,7 +252,6 @@ run-chdir-unveil-backdir-open: REGRESS_TARGETS += run-chdir-unveil-dotdot-open run-chdir-unveil-dotdot-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo ${SUDO} touch /mnt/regress-unveil/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo .. baz @@ -297,7 +259,6 @@ run-chdir-unveil-dotdot-open: REGRESS_TARGETS += run-chdir-dir-unveil-dir-open run-chdir-dir-unveil-dir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} touch /mnt/regress-unveil/foo/bar/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo bar baz @@ -305,7 +266,6 @@ run-chdir-dir-unveil-dir-open: REGRESS_TARGETS += run-chdir-dir-unveil-backdir-open run-chdir-dir-unveil-backdir-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo bar/.. baz @@ -313,7 +273,6 @@ run-chdir-dir-unveil-backdir-open: REGRESS_TARGETS += run-chdir-dir-unveil-dotdot-open run-chdir-dir-unveil-dotdot-open: - @echo '\n======== $@ ========' ${SUDO} mkdir -p /mnt/regress-unveil/foo/bar ${SUDO} touch /mnt/regress-unveil/foo/baz ${SUDO} ./unveil-chdir /mnt/regress-unveil/foo/bar .. baz diff --git a/regress/sys/net/pf_divert/Makefile b/regress/sys/net/pf_divert/Makefile index 6c218053c0b..77f8d61aa89 100644 --- a/regress/sys/net/pf_divert/Makefile +++ b/regress/sys/net/pf_divert/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2019/07/12 19:31:29 bluhm Exp $ +# $OpenBSD: Makefile,v 1.23 2020/12/17 00:51:12 bluhm Exp $ # The following ports must be installed for the regression tests: # p5-IO-Socket-INET6 object interface for AF_INET and AF_INET6 domain sockets @@ -131,13 +131,11 @@ PERLPATH = ${.CURDIR}/ .for inet addr in inet ADDR inet6 ADDR6 run-${inet}-reuse-rip-to-reply-to: - @echo '\n======== $@ ========' @echo 'rip to before reply is broken, it does not remove the state.' @echo DISABLED .for a in ${ARGS} run-${inet}-${a:R}: ${a} - @echo '\n======== $@ ========' .if ${@:M*-packet-*} time ${SUDO} SUDO=${SUDO} KTRACE=${KTRACE} \ perl ${PERLINC} ${PERLPATH}remote.pl -f ${inet} \ @@ -166,7 +164,6 @@ STATE_EXIST_rip_reply-to = ! .for first second in to to to reply to reply-to reply to reply reply reply reply-to reply-to to reply-to reply reply-to reply-to run-${inet}-reuse-${proto}-${first}-${second}: - @echo '\n======== $@ ========' # create state with ${first} divert rule time ${SUDO} SUDO=${SUDO} KTRACE=${KTRACE} \ perl ${PERLINC} ${PERLPATH}remote.pl -f ${inet} \ diff --git a/regress/sys/net/pf_forward/Makefile b/regress/sys/net/pf_forward/Makefile index 26388296d91..6416b6baded 100644 --- a/regress/sys/net/pf_forward/Makefile +++ b/regress/sys/net/pf_forward/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2020/02/02 21:01:53 bluhm Exp $ +# $OpenBSD: Makefile,v 1.32 2020/12/17 00:51:12 bluhm Exp $ # Copyright (c) 2012-2020 Alexander Bluhm <bluhm@openbsd.org> # @@ -150,7 +150,6 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ .for inet in inet inet6 run-ping-mtu-1400-${inet}-RPT_OUT: - @echo '\n======== $@ ========' # RPT_OUT with locally generated ICMP time exceeded cannot work. # The generated packet will not match the out rule with reply-to # so it will be rejected by the route. @@ -158,7 +157,6 @@ run-ping-mtu-1400-${inet}-RPT_OUT: .for proto in icmp udp run-traceroute-${proto}-${inet}-RPT_OUT: - @echo '\n======== $@ ========' # RPT_OUT traceroute cannot work. The ICMP time exceeded packet # generated by IP forward will not match the out rule with reply-to # so it will be rejected by the route. @@ -174,7 +172,6 @@ run-traceroute-${proto}-${inet}-RPT_OUT: AF_IN RTT_IN RTT_OUT RPT_IN RPT_OUT REGRESS_TARGETS += run-ping-${inet}-${ip} run-ping-${inet}-${ip}: stamp-pfctl - @echo '\n======== $@ ========' @echo Check ping ${ip}${inet:S/inet//}: .if "RPT_IN" == ${ip} || "RPT_OUT" == ${ip} ping${inet:S/inet//} -n -c 1 -I ${${ip}${inet:S/inet//}}\ @@ -194,7 +191,6 @@ run-ping-${inet}-${ip}: stamp-pfctl REGRESS_TARGETS += run-ping-mtu-1400-${inet}-${ip} run-ping-mtu-1400-${inet}-${ip}: stamp-pfctl - @echo '\n======== $@ ========' @echo Check path MTU to ${ip}${inet:S/inet//} is 1400 .if "RPT_IN" == ${ip} || "RPT_OUT" == ${ip} ${SUDO} ${PYTHON}ping${inet:S/inet//}_mtu.py ${${ip}${inet:S/inet//}}\ @@ -219,7 +215,6 @@ run-ping-mtu-1400-${inet}-${ip}: stamp-pfctl REGRESS_TARGETS += run-ping-mtu-1300-${inet}-${ip} run-ping-mtu-1300-${inet}-${ip}: stamp-pfctl - @echo '\n======== $@ ========' @echo Check path MTU from ${ip}${inet:S/inet//} is 1300 .if "RPT_IN" == ${ip} || "RPT_OUT" == ${ip} ${SUDO} ${PYTHON}ping${inet:S/inet//}_mtu.py ${${ip}${inet:S/inet//}}\ @@ -240,7 +235,6 @@ run-ping-mtu-1300-${inet}-${ip}: stamp-pfctl REGRESS_TARGETS += run-udp-${inet}-${ip} run-udp-${inet}-${ip}: stamp-pfctl - @echo '\n======== $@ ========' @echo Check UDP ${ip${inet:S/inet//}}: .if "RPT_IN" == ${ip} || "RPT_OUT" == ${ip} echo $$$$ | nc -n -u -W 1 -w 3 -s ${${ip}${inet:S/inet//}}\ @@ -256,7 +250,6 @@ run-udp-${inet}-${ip}: stamp-pfctl REGRESS_TARGETS += run-tcp-${inet}-${ip} run-tcp-${inet}-${ip}: stamp-pfctl - @echo '\n======== $@ ========' @echo Check tcp ${ip}${inet:S/inet//}: ${SUDO} route -n delete -host -inet ${${ip}${inet:S/inet//}} || true .if "RPT_IN" == ${ip} || "RPT_OUT" == ${ip} @@ -284,7 +277,6 @@ TRACEROUTE_CHECK = awk \ .for proto in icmp udp REGRESS_TARGETS += run-traceroute-${proto}-${inet}-${ip} run-traceroute-${proto}-${inet}-${ip}: stamp-pfctl - @echo '\n======== $@ ========' @echo Check traceroute ${proto} ${ip${inet:S/inet//}}: .if "RPT_IN" == ${ip} || "RPT_OUT" == ${ip} traceroute${inet:S/inet//} ${proto:S/icmp/-I/:S/udp//}\ diff --git a/regress/sys/net/pf_fragment/Makefile b/regress/sys/net/pf_fragment/Makefile index 2c1f94e3783..018406d099d 100644 --- a/regress/sys/net/pf_fragment/Makefile +++ b/regress/sys/net/pf_fragment/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2020/01/15 20:47:13 bluhm Exp $ +# $OpenBSD: Makefile,v 1.27 2020/12/17 00:51:12 bluhm Exp $ # Copyright (c) 2011-2020 Alexander Bluhm <bluhm@openbsd.org> # @@ -135,7 +135,6 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ REGRESS_TARGETS += run-ping run-ping: - @echo '\n======== $@ ========' .for ip in SRC_OUT PF_IN PF_OUT RT_IN RT_OUT ECO_IN RDR_IN RTT_IN @echo Check ping ${ip}: ping -n -c 1 ${${ip}} @@ -143,7 +142,6 @@ run-ping: REGRESS_TARGETS += run-ping6 run-ping6: - @echo '\n======== $@ ========' .for ip in SRC_OUT PF_IN PF_OUT RT_IN RT_OUT ECO_IN RDR_IN RTT_IN @echo Check ping ${ip}6: ping6 -n -c 1 ${${ip}6} @@ -155,7 +153,6 @@ run-ping6: REGRESS_TARGETS += run-fragping run-fragping: - @echo '\n======== $@ ========' .for ip in PF_IN PF_OUT RT_IN RT_OUT ECO_IN RDR_IN RTT_IN @echo Check ping ${ip}: ping -n -c 1 -s 5000 ${${ip}} @@ -163,7 +160,6 @@ run-fragping: REGRESS_TARGETS += run-fragping6 run-fragping6: - @echo '\n======== $@ ========' .for ip in PF_IN PF_OUT RT_IN RT_OUT @echo Check ping ${ip}6: ${SUDO} route -n delete -host -inet6 ${${ip}6} || true @@ -184,7 +180,6 @@ run-fragping6: REGRESS_TARGETS += run-ping-mtu run-ping-mtu: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check path MTU to ${ip} ${SUDO} ${PYTHON}ping_mtu_1300.py ${${ip}} @@ -192,7 +187,6 @@ run-ping-mtu: addr.py REGRESS_TARGETS += run-ping6-mtu run-ping6-mtu: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check path MTU to ${ip}6 ${SUDO} ${PYTHON}ping6_mtu_1300.py ${${ip}6} @@ -206,28 +200,24 @@ run-ping6-mtu: addr.py # XXX REGRESS_TARGETS += run-ping-cksum ping6-cksum run-udp-cksum udp6-cksum run-ping-cksum: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ICMP chksum in fragmentation needed to ${ip} ${SUDO} ${PYTHON}ping_cksum.py ${${ip}} .endfor run-ping6-cksum: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ICMP6 chksum in packet too big to ${ip}6 ${SUDO} ${PYTHON}ping6_cksum.py ${${ip}6} .endfor run-udp-cksum: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check UDP chksum in packet too big to ${ip} ${SUDO} ${PYTHON}udp_cksum.py ${${ip}} .endfor run-udp6-cksum: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check UDP6 chksum in packet too big to ${ip}6 ${SUDO} ${PYTHON}udp6_cksum.py ${${ip}6} @@ -237,7 +227,6 @@ run-udp6-cksum: addr.py REGRESS_TARGETS += run-frag6 run-frag: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping reassembly ${ip} ${SUDO} ${PYTHON}frag.py ${${ip}} @@ -245,7 +234,6 @@ run-frag: addr.py REGRESS_TARGETS += run-frag run-frag6: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping6 reassembly ${ip}6 ${SUDO} ${PYTHON}frag6.py ${${ip}6} @@ -253,7 +241,6 @@ run-frag6: addr.py REGRESS_TARGETS += run-frag6-ext run-frag6-ext: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping6 extension header reassembly ${ip}6 ${SUDO} ${PYTHON}frag6_ext.py ${${ip}6} @@ -261,7 +248,6 @@ run-frag6-ext: addr.py REGRESS_TARGETS += run-frag-cutnew run-frag-cutnew: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping head overlap reassembly ${ip} ${SUDO} ${PYTHON}frag_cutnew.py ${${ip}} @@ -269,7 +255,6 @@ run-frag-cutnew: addr.py REGRESS_TARGETS += run-frag6-cutnew run-frag6-cutnew: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping6 head overlap reassembly ${ip}6 ${SUDO} ${PYTHON}frag6_cutnew.py ${${ip}6} @@ -277,7 +262,6 @@ run-frag6-cutnew: addr.py REGRESS_TARGETS += run-frag-cutold run-frag-cutold: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping tail overlap reassembly ${ip} ${SUDO} ${PYTHON}frag_cutold.py ${${ip}} @@ -285,7 +269,6 @@ run-frag-cutold: addr.py REGRESS_TARGETS += run-frag6-cutold run-frag6-cutold: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping6 tail overlap reassembly ${ip}6 ${SUDO} ${PYTHON}frag6_cutold.py ${${ip}6} @@ -293,7 +276,6 @@ run-frag6-cutold: addr.py REGRESS_TARGETS += run-frag-dropold run-frag-dropold: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping total overlapping reassembly ${ip} ${SUDO} ${PYTHON}frag_dropold.py ${${ip}} @@ -301,7 +283,6 @@ run-frag-dropold: addr.py REGRESS_TARGETS += run-frag6-dropold run-frag6-dropold: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping6 total overlapping reassembly ${ip}6 ${SUDO} ${PYTHON}frag6_dropold.py ${${ip}6} @@ -309,7 +290,6 @@ run-frag6-dropold: addr.py REGRESS_TARGETS += run-frag-dropnew run-frag-dropnew: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping total overlaped reassembly ${ip} ${SUDO} ${PYTHON}frag_dropnew.py ${${ip}} @@ -317,7 +297,6 @@ run-frag-dropnew: addr.py REGRESS_TARGETS += run-frag6-dropnew run-frag6-dropnew: addr.py - @echo '\n======== $@ ========' .for ip in ECO_IN RDR_IN RTT_IN @echo Check ping6 total overlaped reassembly ${ip}6 ${SUDO} ${PYTHON}frag6_dropnew.py ${${ip}6} diff --git a/regress/sys/net/pf_state/Makefile b/regress/sys/net/pf_state/Makefile index ef9f438f509..e8fde007eff 100644 --- a/regress/sys/net/pf_state/Makefile +++ b/regress/sys/net/pf_state/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2020/01/15 20:47:13 bluhm Exp $ +# $OpenBSD: Makefile,v 1.11 2020/12/17 00:51:13 bluhm Exp $ # Copyright (c) 2016-2020 Alexander Bluhm <bluhm@openbsd.org> # @@ -115,13 +115,11 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ REGRESS_TARGETS += run-challenge-ack run-challenge-ack: challenge_ack.py addr.py - @echo '\n======== $@ ========' ${SUDO} ${PYTHON}challenge_ack.py .if ! empty(PF_ANCHOR:Mregress) REGRESS_CLEANUP += cleanup cleanup: - @echo '\n======== $@ ========' ${SUDO} pfctl -a regress -Fr rm -f stamp-pfctl .endif diff --git a/regress/sys/net/wg/Makefile b/regress/sys/net/wg/Makefile index 94cf103925e..fb8dee85d02 100644 --- a/regress/sys/net/wg/Makefile +++ b/regress/sys/net/wg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2020/11/04 16:31:41 bluhm Exp $ +# $OpenBSD: Makefile,v 1.2 2020/12/17 00:51:13 bluhm Exp $ # Copyright (c) 2020 Alexander Bluhm <bluhm@openbsd.org> # @@ -54,7 +54,6 @@ $n.pub: ${@:S/.pub$/.key/} REGRESS_SETUP_ONCE = ifconfig ifconfig: ${NUMS:S/$/.pub/} unconfig - @echo '\n======== $@ ========' # create and configure WireGuard interfaces .for n in ${NUMS} ${SUDO} ifconfig wg$n \ @@ -88,7 +87,6 @@ ifconfig: ${NUMS:S/$/.pub/} unconfig REGRESS_CLEANUP = unconfig unconfig: - @echo '\n======== $@ ========' # destroy WireGuard and routing domain loopback interfaces .for n in ${NUMS} -${SUDO} ifconfig wg$n destroy @@ -103,7 +101,6 @@ REGRESS_TARGETS = REGRESS_TARGETS += run-route-tunnel$t-addr$a-${l:L}-${f:L} run-route-tunnel$t-addr$a-${l:L}-${f:L}: - @echo '\n======== $@ ========' # Get route to local address. /sbin/route -n -T ${TUNNEL$t_$l} get ${TUNNEL$t_ADDR$a_$l} | \ grep 'interface: wg${TUNNEL$t_$l}$$' @@ -117,7 +114,6 @@ run-route-tunnel$t-addr$a-${l:L}-${f:L}: REGRESS_TARGETS += run-ping-tunnel$t-addr$a-${l:L}-${f:L} run-ping-tunnel$t-addr$a-${l:L}-${f:L}: - @echo '\n======== $@ ========' # Ping local address. /sbin/ping${a:N4} -n -w 1 -c 1 -V ${TUNNEL$t_$l} ${TUNNEL$t_ADDR$a_$l} # Ping foreign address. @@ -133,7 +129,6 @@ run-ping-tunnel$t-addr$a-${l:L}-${f:L}: REGRESS_TARGETS += run-badkey-tunnel$t-addr$a-${l:L}-${f:L} run-badkey-tunnel$t-addr$a-${l:L}-${f:L}: bad.key - @echo '\n======== $@ ========' # Ping foreign address with bad key. ${SUDO} ifconfig wg${TUNNEL$t_$l} \ wgkey "`cat bad.key`" diff --git a/regress/sys/netinet/arp/Makefile b/regress/sys/netinet/arp/Makefile index 8f3c82ae9a3..4360b7e7229 100644 --- a/regress/sys/netinet/arp/Makefile +++ b/regress/sys/netinet/arp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2019/09/05 12:54:00 bluhm Exp $ +# $OpenBSD: Makefile,v 1.13 2020/12/17 00:51:13 bluhm Exp $ # The following ports must be installed: # @@ -81,7 +81,6 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ REGRESS_SETUP += clean-arp REGRESS_CLEANUP += clean-arp clean-arp: - @echo '\n======== $@ ========' ${SUDO} arp -da ssh ${REMOTE_SSH} ${SUDO} arp -da @@ -90,7 +89,6 @@ clean-arp: # to allow bidirectional packet flow. REGRESS_TARGETS += run-ping run-ping: - @echo '\n======== $@ ========' .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping ${ip} ping -n -c 1 ${${ip}} @@ -102,7 +100,6 @@ run-ping: # Check that the remote machine has the local IP and MAC in its ARP table. REGRESS_TARGETS += run-arp-request run-arp-request: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request for remote address and insert local address ${SUDO} ${PYTHON}arp_request.py ssh ${REMOTE_SSH} ${SUDO} arp -an >arp.log @@ -116,7 +113,6 @@ run-arp-request: addr.py # Check that the remote machine overwrites the local address. REGRESS_TARGETS += run-arp-multicast run-arp-multicast: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request and overwrite entry with multicast ethernet ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ ssh ${REMOTE_SSH} ${SUDO} arp -s ${LOCAL_ADDR} ${LOCAL_MAC} temp @@ -135,7 +131,6 @@ run-arp-multicast: addr.py # Check that all fields of the answer are filled out correctly. REGRESS_TARGETS += run-arp-probe run-arp-probe: addr.py - @echo '\n======== $@ ========' @echo Send ARP Probe for existing address and expect correct reply ${SUDO} ${PYTHON}arp_probe.py @@ -144,7 +139,6 @@ run-arp-probe: addr.py # Check that the remote machine rejects the broadcast sender. REGRESS_TARGETS += run-arp-broadcast run-arp-broadcast: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request with broadcast as sender hardware address ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ scp ${REMOTE_SSH}:/var/log/messages old.log @@ -161,7 +155,6 @@ run-arp-broadcast: addr.py # Check that the remote machine keeps its local ARP entry. REGRESS_TARGETS += run-arp-announcement run-arp-announcement: addr.py - @echo '\n======== $@ ========' @echo Send ARP Announcement for existing address ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ scp ${REMOTE_SSH}:/var/log/messages old.log @@ -179,7 +172,6 @@ run-arp-announcement: addr.py # Check that the remote machine keeps its local ARP entry. REGRESS_TARGETS += run-arp-gratuitous run-arp-gratuitous: addr.py - @echo '\n======== $@ ========' @echo Send Gratuitous ARP for existing address ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ scp ${REMOTE_SSH}:/var/log/messages old.log @@ -198,7 +190,6 @@ run-arp-gratuitous: addr.py # Check that the remote machine keeps its permanent ARP entry. REGRESS_TARGETS += run-arp-permanent run-arp-permanent: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request to change permanent fake address ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ ssh ${REMOTE_SSH} ${SUDO} arp -s ${FAKE_ADDR} ${FAKE_MAC} permanent @@ -218,7 +209,6 @@ run-arp-permanent: addr.py # Check that the remote machine keeps its local ARP entry. REGRESS_TARGETS += run-arp-address run-arp-address: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request to change address on other interface ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ scp ${REMOTE_SSH}:/var/log/messages old.log @@ -238,7 +228,6 @@ run-arp-address: addr.py # Check that the remote machine keeps its ARP entry. REGRESS_TARGETS += run-arp-temporary run-arp-temporary: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request to change temporary entry on other interface ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ ssh ${REMOTE_SSH} ${SUDO} arp -s ${OTHER_FAKE_ADDR} ${FAKE_MAC} temp @@ -260,7 +249,6 @@ run-arp-temporary: addr.py # Check that the remote machine keeps its incomplete ARP entry. REGRESS_TARGETS += run-arp-incomplete run-arp-incomplete: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request filling an incomplete entry on other interface ssh ${REMOTE_SSH} logger -t "arp-regress[$$$$]" $@ ssh ${REMOTE_SSH} ${SUDO} ping -n -w 1 -c 1 ${OTHER_FAKE_ADDR} || true @@ -279,7 +267,6 @@ run-arp-incomplete: addr.py # Check that the remote machine has a public ARP entry. REGRESS_TARGETS += run-arp-proxy run-arp-proxy: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request for fake address that is proxied ssh ${REMOTE_SSH} ${SUDO} arp -s ${FAKE_ADDR} ${PROXY_MAC} ssh ${REMOTE_SSH} ${SUDO} arp -s ${FAKE_ADDR} ${FAKE_MAC} pub @@ -296,7 +283,6 @@ run-arp-proxy: addr.py # Check that the remote machine has a static ARP entry. REGRESS_TARGETS += run-arp-nonproxy run-arp-nonproxy: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request for fake address that is not published ssh ${REMOTE_SSH} ${SUDO} arp -s ${FAKE_ADDR} ${FAKE_MAC} ${SUDO} ${PYTHON}arp_nonproxy.py @@ -311,7 +297,6 @@ run-arp-nonproxy: addr.py # Check that the remote machine has a public ARP entry. REGRESS_TARGETS += run-arp-otherproxy run-arp-otherproxy: addr.py - @echo '\n======== $@ ========' @echo Send ARP Request for address proxied on another interface ssh ${REMOTE_SSH} ${SUDO} arp -s ${OTHER_FAKE_ADDR} ${FAKE_MAC} pub ${SUDO} ${PYTHON}arp_otherproxy.py diff --git a/regress/sys/netinet/frag/Makefile b/regress/sys/netinet/frag/Makefile index ae55e9951ff..27dfc8c119a 100644 --- a/regress/sys/netinet/frag/Makefile +++ b/regress/sys/netinet/frag/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2020/01/15 20:47:13 bluhm Exp $ +# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:13 bluhm Exp $ # The following ports must be installed: # @@ -73,14 +73,12 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ .endif stamp-stack: - @echo '\n======== $@ ========' rm -f stamp-stack stamp-pf -ssh ${REMOTE_SSH} ${SUDO} pfctl -d ssh ${REMOTE_SSH} ${SUDO} pfctl -a regress -Fr date >$@ stamp-pf: addr.py pf.conf - @echo '\n======== $@ ========' rm -f stamp-stack stamp-pf cat addr.py ${.CURDIR}/pf.conf | /sbin/pfctl -n -f - cat addr.py ${.CURDIR}/pf.conf | \ @@ -92,22 +90,18 @@ REGRESS_TARGETS = FRAG_SCRIPTS !!= cd ${.CURDIR} && ls -1 frag*.py run-stack-frag_mf0long.py: - @echo '\n======== $@ ========' # the stack allows fragments with data behind a fragment without MF @echo DISABLED run-stack-frag_mf0short.py: - @echo '\n======== $@ ========' # the stack allows fragments without MF ending before other fragments @echo DISABLED run-stack-frag_mf1end.py: - @echo '\n======== $@ ========' # the stack allows fragments with MF together with fragments without MF @echo DISABLED run-stack-frag_queuelimit.py: - @echo '\n======== $@ ========' # the stack does not limit the amount of fragments during reassembly @echo DISABLED @@ -118,7 +112,6 @@ run-stack-frag_queuelimit.py: ${sp}: run-${sp}-ping REGRESS_TARGETS += run-${sp}-ping run-${sp}-ping: stamp-${sp} - @echo '\n======== $@ ========' .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping ${ip}: ping -n -c 1 ${${ip}} @@ -129,7 +122,6 @@ run-${sp}-ping: stamp-${sp} ${sp}: run-${sp}-fragping REGRESS_TARGETS += run-${sp}-fragping run-${sp}-fragping: stamp-${sp} - @echo '\n======== $@ ========' .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping ${ip}: ping -n -c 1 -s 5000 ${${ip}} @@ -139,7 +131,6 @@ run-${sp}-fragping: stamp-${sp} ${sp}: run-${sp}-${s} REGRESS_TARGETS += run-${sp}-${s} run-${sp}-${s}: addr.py stamp-${sp} - @echo '\n======== $@ ========' ${SUDO} ${PYTHON}${s} .endfor @@ -149,7 +140,6 @@ run-${sp}-${s}: addr.py stamp-${sp} # This is the expected default configuration. REGRESS_CLEANUP += cleanup-pf cleanup-pf: - @echo '\n======== $@ ========' rm -f stamp-stack stamp-pf ssh ${REMOTE_SSH} ${SUDO} pfctl -a regress -Fa -ssh ${REMOTE_SSH} ${SUDO} pfctl -e || true diff --git a/regress/sys/netinet/ipsec/Makefile b/regress/sys/netinet/ipsec/Makefile index a914125ef8c..9b51def008a 100644 --- a/regress/sys/netinet/ipsec/Makefile +++ b/regress/sys/netinet/ipsec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2020/01/15 20:47:13 bluhm Exp $ +# $OpenBSD: Makefile,v 1.27 2020/12/17 00:51:13 bluhm Exp $ # This test needs a manual setup of four machines, the make # target create-setup can be used to distribute the configuration. @@ -171,7 +171,6 @@ regress: # Create python include file containing the addresses. addr.py: Makefile - @echo '\n======== $@ ========' rm -f $@ $@.tmp .for host in SRC IPS RT ECO .for dir in IN OUT BUNDLE @@ -194,7 +193,6 @@ addr.py: Makefile # Load the ipsec sa and flow into the kernel of the SRC and IPS machine. stamp-ipsec: addr.py ipsec.conf - @echo '\n======== $@ ========' cat addr.py ${.CURDIR}/ipsec.conf | /sbin/ipsecctl -n -f - ${SUDO} ipsecctl -F cat addr.py ${.CURDIR}/ipsec.conf | ${SUDO} ipsecctl -f - @@ -205,14 +203,12 @@ stamp-ipsec: addr.py ipsec.conf # Load a pf log enc0 pass any rule into the kernel of the IPS machine. stamp-pfctl: addr.py pf.conf - @echo '\n======== $@ ========' cat addr.py ${.CURDIR}/pf.conf | /sbin/pfctl -n -f - cat addr.py ${.CURDIR}/pf.conf | \ ssh ${IPS_SSH} ${SUDO} pfctl -a regress -f - @date >$@ stamp-reflect: nonxt-reflect - @echo '\n======== $@ ========' ssh ${IPS_SSH} make -C ${.CURDIR} nonxt-reflect ssh ${IPS_SSH} ${SUDO} rcctl start inetd nonxt_reflect -ssh ${ECO_SSH} make -C ${.CURDIR} nonxt-reflect @@ -223,7 +219,6 @@ DUMPCMD= tcpdump -l -e -vvv -s 2048 -ni # Run tcpdump on enc device of IPS machine. stamp-bpf: Makefile stamp-drop - @echo '\n======== $@ ========' rm -f enc0.tcpdump -ssh ${IPS_SSH} ${SUDO} pkill -f "'^${DUMPCMD} enc0'" || true ssh ${IPS_SSH} ${SUDO} ${DUMPCMD} enc0 >enc0.tcpdump & @@ -233,7 +228,6 @@ stamp-bpf: Makefile stamp-drop # Run tcpdump on pflog device of IPS machine. stamp-pflog: stamp-pfctl stamp-drop - @echo '\n======== $@ ========' rm -f pflog0.tcpdump -ssh ${IPS_SSH} ${SUDO} pkill -f "'^${DUMPCMD} pflog0'" || true ssh ${IPS_SSH} ${SUDO} ${DUMPCMD} pflog0 >pflog0.tcpdump & @@ -242,7 +236,6 @@ stamp-pflog: stamp-pfctl stamp-drop @date >$@ stamp-stop: - @echo '\n======== $@ ========' sleep 5 # XXX -ssh ${IPS_SSH} ${SUDO} pkill -f "'^${DUMPCMD}'" @date >$@ @@ -250,7 +243,6 @@ stamp-stop: # Old TCP connections send packets from time to time. These confuse # the checks that count the IPsec packets with netstat -ss. stamp-drop: - @echo '\n======== $@ ========' netstat -nv -p tcp |\ perl -ne '\ / ${PREFIX_IPV6}.* ${PREFIX_IPV6}/ ||\ @@ -272,7 +264,6 @@ run-regress-pflog-ping-IPS_AH_TRANSP_IPV4 \ run-regress-pflog-udp-IPS_AH_TRANSP_IPV6 \ run-regress-pflog-tcp-IPS_AH_TRANSP_IPV6 \ run-regress-pflog-nonxt-IPS_AH_TRANSP_IPV6: - @echo '\n======== $@ ========' @echo IPv6 AH packets are treated as their payload protocol by pf. @echo So they match the floating state on the physical interface @echo and are not logged by the enc0 pf rule. @@ -285,7 +276,6 @@ run-regress-pflog-ping-IPS_AH_TRANSP_IPV4 \ .for ping ipv in ping IPV4 ping6 IPV6 TARGETS += ping-${host}_${dir}_${ipv} run-regress-send-ping-${host}_${dir}_${ipv}: - @echo '\n======== $@ ========' ${ping} -n -c 1 -w 2 ${${host}_${dir}_${ipv}} .endfor .endfor @@ -304,7 +294,6 @@ TARGETS += ping-${len}-${host}_${sec}_${mode}_${ipv} ping ${host:L} ${sec:L} ${mode:L} ${ipv:L}:\ run-regress-send-ping-${len}-${host}_${sec}_${mode}_${ipv} run-regress-send-ping-${len}-${host}_${sec}_${mode}_${ipv}: - @echo '\n======== $@ ========' netstat -s -p ${sec:L:S/ipip/ipencap/:S/bundle/esp/} |\ awk '/input ${sec:S/BUNDLE/ESP/} /{print $$1}' >pkt.in netstat -s -p ${sec:L:S/ipip/ipencap/:S/bundle/esp/} |\ @@ -338,7 +327,6 @@ TARGETS += udp-${host}_${sec}_${mode}_${ipv} udp ${host:L} ${sec:L} ${mode:L} ${ipv:L}:\ run-regress-send-udp-${host}_${sec}_${mode}_${ipv} run-regress-send-udp-${host}_${sec}_${mode}_${ipv}: - @echo '\n======== $@ ========' netstat -s -p ${sec:L:S/ipip/ipencap/:S/bundle/esp/} |\ awk '/input ${sec:S/BUNDLE/ESP/} /{print $$1}' >pkt.in netstat -s -p ${sec:L:S/ipip/ipencap/:S/bundle/esp/} |\ @@ -365,7 +353,6 @@ TARGETS += tcp-${host}_${sec}_${mode}_${ipv} tcp ${host:L} ${sec:L} ${mode:L} ${ipv:L}:\ run-regress-send-tcp-${host}_${sec}_${mode}_${ipv} run-regress-send-tcp-${host}_${sec}_${mode}_${ipv}: - @echo '\n======== $@ ========' echo $$$$ | nc -n -N -w 3 ${${host}_${sec}_${mode}_${ipv}} 7 |\ fgrep $$$$ @@ -376,7 +363,6 @@ TARGETS += nonxt-${host}_${sec}_${mode}_${ipv} nonxt ${host:L} ${sec:L} ${mode:L} ${ipv:L}:\ run-regress-send-nonxt-${host}_${sec}_${mode}_${ipv} run-regress-send-nonxt-${host}_${sec}_${mode}_${ipv}: nonxt-sendrecv - @echo '\n======== $@ ========' netstat -s -p ${sec:L:S/ipip/ipencap/:S/bundle/esp/} |\ awk '/input ${sec:S/BUNDLE/ESP/} /{print $$1}' >pkt.in netstat -s -p ${sec:L:S/ipip/ipencap/:S/bundle/esp/} |\ @@ -457,7 +443,6 @@ REGEX_RPL_${host}_${sec}_${mode}_${ipv}_NONXT=\ .for proto in PING UDP TCP NONXT run-regress-bpf-${proto:L}-${host}_${sec}_${mode}_${ipv}: stamp-stop - @echo '\n======== $@ ========' egrep -q '\ ${REGEX_${sec}}\ ${REGEX_REQ_${mode}}\ @@ -470,7 +455,6 @@ run-regress-bpf-${proto:L}-${host}_${sec}_${mode}_${ipv}: stamp-stop ${REGEX_RPL_${proto}} ' enc0.tcpdump run-regress-pflog-${proto:L}-${host}_${sec}_${mode}_${ipv}: stamp-stop - @echo '\n======== $@ ========' egrep -q '\ rule .*regress.0/\(match\) .*\ pass in on enc0:.*\ @@ -505,7 +489,6 @@ create-setup: stamp-hostname stamp-inetd stamp-nonxt-reflect # Create hostname.if files, copy them to the machines and install addresses. etc/hostname.${SRC_OUT_IF}: Makefile - @echo '\n======== $@ ========' mkdir -p ${@:H} rm -f $@ $@.tmp echo '### regress ipsec $@' >$@.tmp @@ -584,7 +567,6 @@ ${IPS_SSH}/hostname.${IPS_IN_IF}: Makefile mv $@.tmp $@ ${IPS_SSH}/hostname.${IPS_OUT_IF}: Makefile - @echo '\n======== $@ ========' mkdir -p ${@:H} rm -f $@ $@.tmp echo '### regress ipsec $@' >$@.tmp @@ -620,7 +602,6 @@ ${IPS_SSH}/hostname.${IPS_OUT_IF}: Makefile mv $@.tmp $@ ${RT_SSH}/hostname.${RT_IN_IF}: Makefile - @echo '\n======== $@ ========' mkdir -p ${@:H} rm -f $@ $@.tmp echo '### regress ipsec $@' >$@.tmp @@ -650,7 +631,6 @@ ${RT_SSH}/hostname.${RT_IN_IF}: Makefile mv $@.tmp $@ ${RT_SSH}/hostname.${RT_OUT_IF}: Makefile - @echo '\n======== $@ ========' mkdir -p ${@:H} rm -f $@ $@.tmp echo '### regress ipsec $@' >$@.tmp @@ -673,7 +653,6 @@ ${RT_SSH}/hostname.${RT_OUT_IF}: Makefile mv $@.tmp $@ ${ECO_SSH}/hostname.${ECO_IN_IF}: Makefile - @echo '\n======== $@ ========' mkdir -p ${@:H} rm -f $@ $@.tmp echo '### regress ipsec $@' >$@.tmp @@ -714,7 +693,6 @@ stamp-hostname: etc/hostname.${SRC_OUT_IF} \ ${IPS_SSH}/hostname.${IPS_IN_IF} ${IPS_SSH}/hostname.${IPS_OUT_IF} \ ${RT_SSH}/hostname.${RT_IN_IF} ${RT_SSH}/hostname.${RT_OUT_IF} \ ${ECO_SSH}/hostname.${ECO_IN_IF} - @echo '\n======== $@ ========' ${SUDO} sh -c "umask 027;\ { sed '/^### regress/,\$$d' /etc/hostname.${SRC_OUT_IF} &&\ cat; } >/etc/hostname.${SRC_OUT_IF}.tmp"\ @@ -737,7 +715,6 @@ stamp-hostname: etc/hostname.${SRC_OUT_IF} \ .for host in IPS ECO ${${host}_SSH}/inetd.conf: Makefile - @echo '\n======== $@ ========' mkdir -p ${@:H} rm -f $@ $@.tmp echo '### regress ipsec $@' >$@.tmp @@ -757,7 +734,6 @@ ${${host}_SSH}/inetd.conf: Makefile .endfor stamp-inetd: ${IPS_SSH}/inetd.conf ${ECO_SSH}/inetd.conf - @echo '\n======== $@ ========' .for host in IPS ECO ssh root@${${host}_SSH} "umask 022;\ { sed '/^### regress/,\$$d' /etc/inetd.conf && cat; }\ @@ -774,7 +750,6 @@ stamp-inetd: ${IPS_SSH}/inetd.conf ${ECO_SSH}/inetd.conf .for host in IPS ECO ${${host}_SSH}/nonxt_reflect: nonxt_reflect.sh Makefile - @echo '\n======== $@ ========' mkdir -p ${@:H} rm -f $@ $@.tmp echo '#!/bin/ksh' >$@.tmp @@ -798,7 +773,6 @@ ${${host}_SSH}/nonxt_reflect: nonxt_reflect.sh Makefile stamp-nonxt-reflect: ${IPS_SSH}/nonxt_reflect ${ECO_SSH}/nonxt_reflect \ nonxt-reflect - @echo '\n======== $@ ========' .for host in IPS ECO ssh ${${host}_SSH} make -C ${.CURDIR} nonxt-reflect scp ${${host}_SSH}/nonxt_reflect root@${${host}_SSH}:/etc/rc.d/ diff --git a/regress/sys/netinet/mcast/Makefile b/regress/sys/netinet/mcast/Makefile index 8cec185d44f..dc3da5a5af4 100644 --- a/regress/sys/netinet/mcast/Makefile +++ b/regress/sys/netinet/mcast/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2019/09/05 18:27:19 bluhm Exp $ +# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:13 bluhm Exp $ PROGS = mcsend mcrecv mcroute WARNINGS = Yes @@ -27,7 +27,6 @@ GROUP_LOCAL = 224.0.0.123 REGRESS_TARGETS += run-localhost run-localhost: - @echo '\n======== $@ ========' # send over localhost interface ${RECV} -f recv.log -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -i ${LOCALHOST} -m '${MSG}' @@ -36,7 +35,6 @@ run-localhost: REGRESS_TARGETS += run-localhost-loop run-localhost-loop: - @echo '\n======== $@ ========' # explicitly enable loop back on multicast interface ${RECV} -f recv.log -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -i ${LOCALHOST} -l 1 -m '${MSG}' @@ -45,7 +43,6 @@ run-localhost-loop: REGRESS_TARGETS += run-localhost-loop0 run-localhost-loop0: - @echo '\n======== $@ ========' # disable loop back on multicast interface, must fail ${RECV} -f recv.log -i ${LOCALHOST} -n 1 -- \ ${SEND} -f send.log -i ${LOCALHOST} -l 0 -m '${MSG}' @@ -54,7 +51,6 @@ run-localhost-loop0: REGRESS_TARGETS += run-localhost-ttl0 run-localhost-ttl0: - @echo '\n======== $@ ========' # send over localhost interface ${RECV} -f recv.log -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -i ${LOCALHOST} -m '${MSG}' -t 0 @@ -63,7 +59,6 @@ run-localhost-ttl0: REGRESS_TARGETS += run-localhost-local run-localhost-local: - @echo '\n======== $@ ========' # send over localhost interface ${RECV} -f recv.log -g ${GROUP_LOCAL} -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -g ${GROUP_LOCAL} -i ${LOCALHOST} -m '${MSG}' -t 0 @@ -72,7 +67,6 @@ run-localhost-local: REGRESS_TARGETS += run-localaddr run-localaddr: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ${SEND} -f send.log -i ${LOCAL} -m '${MSG}' @@ -81,7 +75,6 @@ run-localaddr: REGRESS_TARGETS += run-localaddr-loop0 run-localaddr-loop0: - @echo '\n======== $@ ========' # send over physical interface to loopback, ttl is 0 ${RECV} -f recv.log -i ${LOCAL} -n 1 -- \ ${SEND} -f send.log -i ${LOCAL} -l 0 -m '${MSG}' @@ -90,7 +83,6 @@ run-localaddr-loop0: REGRESS_TARGETS += run-localaddr-ttl0 run-localaddr-ttl0: - @echo '\n======== $@ ========' # send over physical interface to loopback, ttl is 0 ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ${SEND} -f send.log -i ${LOCAL} -m '${MSG}' -t 0 @@ -99,7 +91,6 @@ run-localaddr-ttl0: REGRESS_TARGETS += run-localaddr-local run-localaddr-local: - @echo '\n======== $@ ========' # send over physical interface to loopback, ttl is 0 ${RECV} -f recv.log -g ${GROUP_LOCAL} -i ${LOCAL} -r 5 -- \ ${SEND} -f send.log -g ${GROUP_LOCAL} -i ${LOCAL} -m '${MSG}' -t 0 @@ -108,7 +99,6 @@ run-localaddr-local: REGRESS_TARGETS += run-remoteaddr run-remoteaddr: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ssh ${REMOTE_SSH} ${SEND} -f ${.OBJDIR}/send.log \ @@ -117,7 +107,6 @@ run-remoteaddr: REGRESS_TARGETS += run-remoteaddr-loop0 run-remoteaddr-loop0: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ssh ${REMOTE_SSH} ${SEND} -f ${.OBJDIR}/send.log \ @@ -126,7 +115,6 @@ run-remoteaddr-loop0: REGRESS_TARGETS += run-remoteaddr-ttl0 run-remoteaddr-ttl0: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -n 2 -- \ ssh ${REMOTE_SSH} ${SEND} -f ${.OBJDIR}/send.log \ @@ -135,7 +123,6 @@ run-remoteaddr-ttl0: REGRESS_TARGETS += run-forward run-forward: - @echo '\n======== $@ ========' # start multicast router, start receiver, start sender ssh ${REMOTE_SSH} ${SUDO} pkill mcroute mc6route || true ssh ${REMOTE_SSH} ${SUDO} ${ROUTE} -f ${.OBJDIR}/route.log \ @@ -154,7 +141,6 @@ run-forward: REGRESS_TARGETS += run-forward-ttl1 run-forward-ttl1: - @echo '\n======== $@ ========' # try to get ttl 1 over multicast router, must fail ssh ${REMOTE_SSH} ${SUDO} pkill mcroute mc6route || true ssh ${REMOTE_SSH} ${SUDO} ${ROUTE} -f ${.OBJDIR}/route.log \ @@ -173,7 +159,6 @@ run-forward-ttl1: REGRESS_TARGETS += run-forward-local run-forward-local: - @echo '\n======== $@ ========' # try to get local multicast group over router, must fail ssh ${REMOTE_SSH} ${SUDO} pkill mcroute mc6route || true ssh ${REMOTE_SSH} ${SUDO} ${ROUTE} -f ${.OBJDIR}/route.log \ diff --git a/regress/sys/netinet/pmtu/Makefile b/regress/sys/netinet/pmtu/Makefile index 70971f67367..cdeb08fbb34 100644 --- a/regress/sys/netinet/pmtu/Makefile +++ b/regress/sys/netinet/pmtu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2019/05/10 02:22:34 bluhm Exp $ +# $OpenBSD: Makefile,v 1.13 2020/12/17 00:51:13 bluhm Exp $ # The following ports must be installed: # @@ -82,12 +82,10 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ # Clear local and remote path mtu routes, set fake net route REGRESS_CLEANUP += reset-route reset-route: - @echo '\n======== $@ ========' ${SUDO} route -n delete -inet -host ${REMOTE_ADDR} || true ssh ${REMOTE_SSH} ${SUDO} route -n delete -inet -host ${FAKE_NET_ADDR} || true REGRESS_CLEANUP += reset-route6 reset-route6: - @echo '\n======== $@ ========' ${SUDO} route -n delete -inet6 -host ${REMOTE_ADDR6} || true ssh ${REMOTE_SSH} ${SUDO} route -n delete -inet6 -host ${FAKE_NET_ADDR6} || true @@ -96,14 +94,12 @@ reset-route6: # to allow bidirectional packet flow. REGRESS_TARGETS += run-ping run-ping: reset-route - @echo '\n======== $@ ========' .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping ${ip} ping -n -c 1 ${${ip}} .endfor REGRESS_TARGETS += run-ping6 run-ping6: reset-route6 - @echo '\n======== $@ ========' .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping6 ${ip}6 ping6 -n -c 1 ${${ip}6} @@ -111,24 +107,20 @@ run-ping6: reset-route6 REGRESS_TARGETS += run-pmtu run-pmtu: addr.py reset-route - @echo '\n======== $@ ========' @echo Send ICMP fragmentation needed after fake TCP connect ${SUDO} ${PYTHON}tcp_connect.py REGRESS_TARGETS += run-pmtu6 run-pmtu6: addr.py reset-route6 - @echo '\n======== $@ ========' @echo Send ICMP6 packet too big after fake TCP connect ${SUDO} ${PYTHON}tcp_connect6.py REGRESS_TARGETS += run-udp6 run-udp6: addr.py reset-route6 - @echo '\n======== $@ ========' @echo Send ICMP6 packet too big after UDP echo ${SUDO} ${PYTHON}udp_echo6.py REGRESS_TARGETS += run-gateway6 run-gateway6: run-udp6 - @echo '\n======== $@ ========' @echo Remove gateway route of a dynamic PMTU route ssh ${REMOTE_SSH} ${SUDO} route -n delete -inet6 -host ${LOCAL_ADDR6} ssh ${REMOTE_SSH} route -n get -inet6 -host ${FAKE_NET_ADDR6}\ @@ -140,12 +132,10 @@ run-gateway6: run-udp6 REGRESS_TARGETS += run-tcpfrag6 run-tcpfrag6: addr.py reset-route6 - @echo '\n======== $@ ========' @echo Send ICMP6 and try to trigger a short TCP segment ${SUDO} ${PYTHON}tcp_atomicfrag6.py REGRESS_TARGETS += run-udpfrag6 run-udpfrag6: addr.py reset-route6 - @echo '\n======== $@ ========' @echo Send ICMP6 and try to trigger an atomic UDP IPv6 fragment ${SUDO} ${PYTHON}udp_atomicfrag6.py diff --git a/regress/sys/netinet6/frag6/Makefile b/regress/sys/netinet6/frag6/Makefile index 06555b1eb05..7aae512b354 100644 --- a/regress/sys/netinet6/frag6/Makefile +++ b/regress/sys/netinet6/frag6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2019/05/10 02:22:34 bluhm Exp $ +# $OpenBSD: Makefile,v 1.26 2020/12/17 00:51:13 bluhm Exp $ # The following ports must be installed: # @@ -73,14 +73,12 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ .endif stamp-stack: - @echo '\n======== $@ ========' rm -f stamp-stack stamp-pf -ssh ${REMOTE_SSH} ${SUDO} pfctl -d ssh ${REMOTE_SSH} ${SUDO} pfctl -a regress -Fr date >$@ stamp-pf: addr.py pf.conf - @echo '\n======== $@ ========' rm -f stamp-stack stamp-pf cat addr.py ${.CURDIR}/pf.conf | pfctl -n -f - cat addr.py ${.CURDIR}/pf.conf | \ @@ -91,7 +89,6 @@ stamp-pf: addr.py pf.conf FRAG6_SCRIPTS !!= cd ${.CURDIR} && ls -1 frag6*.py run-stack-frag6_queuelimit.py: - @echo '\n======== $@ ========' # the stack does not limit the amount of fragments during reassembly @echo DISABLED @@ -102,7 +99,6 @@ run-stack-frag6_queuelimit.py: ${sp}: run-${sp}-ping6 REGRESS_TARGETS += run-${sp}-ping6 run-${sp}-ping6: stamp-${sp} - @echo '\n======== $@ ========' .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping6 ${ip}6: ping6 -n -c 1 ${${ip}6} @@ -113,7 +109,6 @@ run-${sp}-ping6: stamp-${sp} ${sp}: run-${sp}-fragping6 REGRESS_TARGETS += run-${sp}-fragping6 run-${sp}-fragping6: stamp-${sp} - @echo '\n======== $@ ========' .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping6 ${ip}6: ping6 -n -c 1 -s 5000 -m ${${ip}6} @@ -123,7 +118,6 @@ run-${sp}-fragping6: stamp-${sp} ${sp}: run-${sp}-${s} REGRESS_TARGETS += run-${sp}-${s} run-${sp}-${s}: addr.py stamp-${sp} - @echo '\n======== $@ ========' ${SUDO} ${PYTHON}${s} .endfor diff --git a/regress/sys/netinet6/mcast6/Makefile b/regress/sys/netinet6/mcast6/Makefile index 5cd03317129..6013748ebb5 100644 --- a/regress/sys/netinet6/mcast6/Makefile +++ b/regress/sys/netinet6/mcast6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2019/09/05 18:27:19 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:13 bluhm Exp $ PROGS = mc6send mc6recv mc6route WARNINGS = Yes @@ -31,7 +31,6 @@ REGRESS_EXPECTED_FAILURES = run-localhost-local REGRESS_TARGETS += run-localhost run-localhost: - @echo '\n======== $@ ========' # send over localhost interface ${RECV} -f recv.log -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -i ${LOCALHOST} -m '${MSG}' @@ -40,7 +39,6 @@ run-localhost: REGRESS_TARGETS += run-localhost-loop run-localhost-loop: - @echo '\n======== $@ ========' # explicitly enable loop back on multicast interface ${RECV} -f recv.log -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -i ${LOCALHOST} -l 1 -m '${MSG}' @@ -49,7 +47,6 @@ run-localhost-loop: REGRESS_TARGETS += run-localhost-loop0 run-localhost-loop0: - @echo '\n======== $@ ========' # disable loop back on multicast interface, must fail ${RECV} -f recv.log -i ${LOCALHOST} -n 1 -- \ ${SEND} -f send.log -i ${LOCALHOST} -l 0 -m '${MSG}' @@ -58,7 +55,6 @@ run-localhost-loop0: REGRESS_TARGETS += run-localhost-ttl0 run-localhost-ttl0: - @echo '\n======== $@ ========' # send over localhost interface ${RECV} -f recv.log -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -i ${LOCALHOST} -m '${MSG}' -t 0 @@ -67,7 +63,6 @@ run-localhost-ttl0: REGRESS_TARGETS += run-localhost-local run-localhost-local: - @echo '\n======== $@ ========' # send over localhost interface ${RECV} -f recv.log -g ${GROUP_LOCAL} -i ${LOCALHOST} -r 5 -- \ ${SEND} -f send.log -g ${GROUP_LOCAL} -i ${LOCALHOST} -m '${MSG}' -t 0 @@ -76,7 +71,6 @@ run-localhost-local: REGRESS_TARGETS += run-localaddr run-localaddr: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ${SEND} -f send.log -i ${LOCAL} -m '${MSG}' @@ -85,7 +79,6 @@ run-localaddr: REGRESS_TARGETS += run-localaddr-loop0 run-localaddr-loop0: - @echo '\n======== $@ ========' # send over physical interface to loopback, ttl is 0 ${RECV} -f recv.log -i ${LOCAL} -n 1 -- \ ${SEND} -f send.log -i ${LOCAL} -l 0 -m '${MSG}' @@ -94,7 +87,6 @@ run-localaddr-loop0: REGRESS_TARGETS += run-localaddr-ttl0 run-localaddr-ttl0: - @echo '\n======== $@ ========' # send over physical interface to loopback, ttl is 0 ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ${SEND} -f send.log -i ${LOCAL} -m '${MSG}' -t 0 @@ -103,7 +95,6 @@ run-localaddr-ttl0: REGRESS_TARGETS += run-localaddr-local run-localaddr-local: - @echo '\n======== $@ ========' # send over physical interface to loopback, ttl is 0 ${RECV} -f recv.log -g ${GROUP_LOCAL} -i ${LOCAL} -r 5 -- \ ${SEND} -f send.log -g ${GROUP_LOCAL} -i ${LOCAL} -m '${MSG}' -t 0 @@ -112,7 +103,6 @@ run-localaddr-local: REGRESS_TARGETS += run-remoteaddr run-remoteaddr: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ssh ${REMOTE_SSH} ${SEND} -f ${.OBJDIR}/send.log \ @@ -121,7 +111,6 @@ run-remoteaddr: REGRESS_TARGETS += run-remoteaddr-loop0 run-remoteaddr-loop0: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -r 5 -- \ ssh ${REMOTE_SSH} ${SEND} -f ${.OBJDIR}/send.log \ @@ -130,7 +119,6 @@ run-remoteaddr-loop0: REGRESS_TARGETS += run-remoteaddr-ttl0 run-remoteaddr-ttl0: - @echo '\n======== $@ ========' # send over a local physical interface ${RECV} -f recv.log -i ${LOCAL} -n 2 -- \ ssh ${REMOTE_SSH} ${SEND} -f ${.OBJDIR}/send.log \ @@ -139,7 +127,6 @@ run-remoteaddr-ttl0: REGRESS_TARGETS += run-forward run-forward: - @echo '\n======== $@ ========' # start multicast router, start receiver, start sender ssh ${REMOTE_SSH} ${SUDO} pkill mcroute mc6route || true ssh ${REMOTE_SSH} ${SUDO} ${ROUTE} -f ${.OBJDIR}/route.log \ @@ -158,7 +145,6 @@ run-forward: REGRESS_TARGETS += run-forward-ttl1 run-forward-ttl1: - @echo '\n======== $@ ========' # try to get ttl 1 over multicast router, must fail ssh ${REMOTE_SSH} ${SUDO} pkill mcroute mc6route || true ssh ${REMOTE_SSH} ${SUDO} ${ROUTE} -f ${.OBJDIR}/route.log \ @@ -177,7 +163,6 @@ run-forward-ttl1: REGRESS_TARGETS += run-forward-local run-forward-local: - @echo '\n======== $@ ========' # try to get local multicast group over router, must fail ssh ${REMOTE_SSH} ${SUDO} pkill mcroute mc6route || true ssh ${REMOTE_SSH} ${SUDO} ${ROUTE} -f ${.OBJDIR}/route.log \ diff --git a/regress/sys/netinet6/nd6/Makefile b/regress/sys/netinet6/nd6/Makefile index 856b16adc20..6da0b122270 100644 --- a/regress/sys/netinet6/nd6/Makefile +++ b/regress/sys/netinet6/nd6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/05/10 02:22:34 bluhm Exp $ +# $OpenBSD: Makefile,v 1.10 2020/12/17 00:51:13 bluhm Exp $ # The following ports must be installed: # @@ -87,7 +87,6 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ # to allow bidirectional packet flow. REGRESS_TARGETS = run-ping6 run-ping6: - @echo '\n======== $@ ========' ${SUDO} ndp -c .for ip in LOCAL_ADDR REMOTE_ADDR @echo Check ping6 ${ip}6: @@ -99,7 +98,6 @@ ND6_SCRIPTS !!= cd ${.CURDIR} && ls -1 nd6*.py .for s in ${ND6_SCRIPTS} REGRESS_TARGETS = run-${s} run-${s}: addr.py - @echo '\n======== $@ ========' ${SUDO} ${PYTHON}${s} .endfor diff --git a/regress/sys/netinet6/rh0/Makefile b/regress/sys/netinet6/rh0/Makefile index 2521c2fa4f8..db790d35449 100644 --- a/regress/sys/netinet6/rh0/Makefile +++ b/regress/sys/netinet6/rh0/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2020/01/15 20:47:14 bluhm Exp $ +# $OpenBSD: Makefile,v 1.14 2020/12/17 00:51:13 bluhm Exp $ # The following ports must be installed: # @@ -80,7 +80,6 @@ PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/ .endif stamp-stack: - @echo '\n======== $@ ========' rm -f stamp-stack stamp-pf -ssh ${REMOTE_SSH} ${SUDO} pfctl -d ssh ${REMOTE_SSH} ${SUDO} pfctl -a regress -Fr @@ -90,7 +89,6 @@ stamp-stack: # This is the expected default configuration. REGRESS_CLEANUP += stamp-pf stamp-pf: - @echo '\n======== $@ ========' rm -f stamp-stack stamp-pf echo 'pass proto tcp from port ssh no state\n'\ 'pass proto tcp to port ssh no state'|\ @@ -103,7 +101,6 @@ RH0_SCRIPTS !!= cd ${.CURDIR} && ls -1 rh0*.py .for s in ${RH0_SCRIPTS} REGRESS_TARGETS = run-${s} run-${s}: addr.py stamp-stack - @echo '\n======== $@ ========' ${SUDO} ${PYTHON}${s} .endfor diff --git a/regress/sys/netinet6/rip6cksum/Makefile b/regress/sys/netinet6/rip6cksum/Makefile index ac111c6dd5e..954cec8b815 100644 --- a/regress/sys/netinet6/rip6cksum/Makefile +++ b/regress/sys/netinet6/rip6cksum/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2019/05/10 14:45:00 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:13 bluhm Exp $ # The following ports must be installed: # @@ -18,117 +18,100 @@ PYTHON = python2.7 -u ${.CURDIR}/ REGRESS_TARGETS += run-error-negative run-error-negative: - @echo "\n======== $@ ========" # set socket option IPV6_CHECKSUM to -2, expect error ${SUDO} ./rip6cksum -c -2 -e REGRESS_TARGETS += run-error-odd run-error-odd: - @echo "\n======== $@ ========" # set socket option IPV6_CHECKSUM to 1, expect error ${SUDO} ./rip6cksum -c 1 -e REGRESS_TARGETS += run-no-cksum run-no-cksum: # send and receive packet without checksum - @echo "\n======== $@ ========" ${SUDO} ./rip6cksum -r 32 -s 8 -w -- \ ${PYTHON}sendrecv.py -r 8 -s 32 REGRESS_TARGETS += run-bad-cksum run-bad-cksum: # enable checksum, send packet without checksum, expect icmp - @echo "\n======== $@ ========" ${SUDO} ./rip6cksum -c 0 -- \ ${PYTHON}sendrecv.py -i -r 32 -s 32 REGRESS_TARGETS += run-disable-cksum run-disable-cksum: # send and receive packet with explicitly disabled checksum - @echo "\n======== $@ ========" ${SUDO} ./rip6cksum -c -1 -r 32 -s 8 -w -- \ ${PYTHON}sendrecv.py -r 8 -s 32 REGRESS_TARGETS += run-ckoff-0 run-ckoff-0: - @echo "\n======== $@ ========" # use checksum at offset 0 ${SUDO} ./rip6cksum -c 0 -r 32 -s 8 -w -- \ ${PYTHON}sendrecv.py -c 0 -r 8 -s 32 REGRESS_TARGETS += run-ckoff-0-empty run-ckoff-0-empty: - @echo "\n======== $@ ========" # use checksum at offset 0, but packet is empty, expect icmp ${SUDO} ./rip6cksum -c 0 -- \ ${PYTHON}sendrecv.py -i -r 0 -s 0 REGRESS_TARGETS += run-ckoff-0-short run-ckoff-0-short: - @echo "\n======== $@ ========" # use checksum at offset 0, but packet is only 1 byte long, expect icmp ${SUDO} ./rip6cksum -c 0 -- \ ${PYTHON}sendrecv.py -i -r 1 -s 1 REGRESS_TARGETS += run-ckoff-0-exact run-ckoff-0-exact: - @echo "\n======== $@ ========" # use checksum at offset 0, packet is exactly 2 bytes long ${SUDO} ./rip6cksum -c 0 -r 2 -s 2 -w -- \ ${PYTHON}sendrecv.py -c 0 -s 2 REGRESS_TARGETS += run-ckoff-0-long run-ckoff-0-long: - @echo "\n======== $@ ========" # use checksum at offset 0, packet is 3 bytes long ${SUDO} ./rip6cksum -c 0 -r 3 -s 3 -w -- \ ${PYTHON}sendrecv.py -c 0 -s 3 REGRESS_TARGETS += run-ckoff-2 run-ckoff-2: - @echo "\n======== $@ ========" # use checksum at offset 2 ${SUDO} ./rip6cksum -c 2 -r 32 -s 8 -w -- \ ${PYTHON}sendrecv.py -c 2 -r 8 -s 32 REGRESS_TARGETS += run-ckoff-2-empty run-ckoff-2-empty: - @echo "\n======== $@ ========" # use checksum at offset 2, but packet is empty, expect icmp ${SUDO} ./rip6cksum -c 2 -- \ ${PYTHON}sendrecv.py -i -r 0 -s 0 REGRESS_TARGETS += run-ckoff-2-short-1 run-ckoff-2-short-1: - @echo "\n======== $@ ========" # use checksum at offset 2, but packet is only 1 byte long, expect icmp ${SUDO} ./rip6cksum -c 2 -- \ ${PYTHON}sendrecv.py -i -r 1 -s 1 REGRESS_TARGETS += run-ckoff-2-short-2 run-ckoff-2-short-2: - @echo "\n======== $@ ========" # use checksum at offset 2, but packet is only 2 byte long, expect icmp ${SUDO} ./rip6cksum -c 2 -- \ ${PYTHON}sendrecv.py -i -r 2 -s 2 REGRESS_TARGETS += run-ckoff-2-short-3 run-ckoff-2-short-3: - @echo "\n======== $@ ========" # use checksum at offset 2, but packet is only 3 byte long, expect icmp ${SUDO} ./rip6cksum -c 2 -- \ ${PYTHON}sendrecv.py -i -r 3 -s 3 REGRESS_TARGETS += run-ckoff-2-exact run-ckoff-2-exact: - @echo "\n======== $@ ========" # use checksum at offset 2, packet is exactly 4 bytes long ${SUDO} ./rip6cksum -c 2 -r 4 -s 4 -w -- \ ${PYTHON}sendrecv.py -c 2 -s 4 REGRESS_TARGETS += run-ckoff-2-long run-ckoff-2-long: - @echo "\n======== $@ ========" # use checksum at offset 2, packet is 5 bytes long ${SUDO} ./rip6cksum -c 2 -r 5 -s 5 -w -- \ ${PYTHON}sendrecv.py -c 2 -s 5 |