diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2020-12-16 22:59:56 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2020-12-16 22:59:56 +0000 |
| commit | ae72c956001008ada248c4a336640dc328c35340 (patch) | |
| tree | 116bd896121147a34682e852c7eca5102631cb73 /regress/usr.sbin | |
| parent | d9c39fa94dc5fc818c0325c2d8ceafeadfb5b5e1 (diff) | |
Remove echo headlines. Use consistent target names.
Diffstat (limited to 'regress/usr.sbin')
| -rw-r--r-- | regress/usr.sbin/vmd/config/Makefile | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/regress/usr.sbin/vmd/config/Makefile b/regress/usr.sbin/vmd/config/Makefile index fdbe4072260..1a769794958 100644 --- a/regress/usr.sbin/vmd/config/Makefile +++ b/regress/usr.sbin/vmd/config/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/07/16 21:07:08 bluhm Exp $ +# $OpenBSD: Makefile,v 1.10 2020/12/16 22:59:55 bluhm Exp $ VMD ?= /usr/sbin/vmd @@ -9,29 +9,23 @@ VMD_FAIL=kernel-keyword too-few-ram vm-name-too-long too-many-ifs \ switch-no-interface switch-no-add cdrom-name-too-long \ bad-format missing-format -REGRESS_TARGETS= - .for n in ${VMD_PASS} -REGRESS_TARGETS += vmd-pass-${n} - -vmd-pass-${n}: - @echo '======== $@ ========' - ${VMD} -n -f ${.CURDIR}/vmd-pass-${n}.conf 2>&1 | \ - diff -u ${.CURDIR}/vmd-pass-${n}.ok /dev/stdin +REGRESS_TARGETS += run-pass-$n +run-pass-$n: + ${VMD} -n -f ${.CURDIR}/vmd-pass-$n.conf 2>&1 | \ + diff -u ${.CURDIR}/vmd-pass-$n.ok /dev/stdin .endfor .for n in ${VMD_FAIL} -REGRESS_TARGETS += vmd-fail-${n} - -vmd-fail-${n}: - @echo '======== $@ ========' - ${VMD} -n -f ${.CURDIR}/vmd-fail-${n}.conf 2>&1 | \ +REGRESS_TARGETS += run-fail-$n +run-fail-$n: + ${VMD} -n -f ${.CURDIR}/vmd-fail-$n.conf 2>&1 | \ cut -d : -f 2,3,4 | \ - diff -u ${.CURDIR}/vmd-fail-${n}.ok /dev/stdin + diff -u ${.CURDIR}/vmd-fail-$n.ok /dev/stdin .endfor -vmd-fail-too-many-disks: disk0.img disk1.img disk2.img disk3.img disk4.img -vmd-fail-bad-format vmd-fail-missing-format vmd-pass-format-keyword: foo.img +run-fail-too-many-disks: disk0.img disk1.img disk2.img disk3.img disk4.img +run-fail-bad-format run-fail-missing-format run-pass-format-keyword: foo.img foo.img disk0.img disk1.img disk2.img disk3.img disk4.img: touch $@ @@ -40,8 +34,8 @@ PATH_LONG = some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abc BOOT_PATH_LONG = ${PATH_LONG}/bsd.rd DISK_PATH_LONG = ${PATH_LONG}/bsd.img -vmd-fail-boot-name-too-long: ${BOOT_PATH_LONG} -vmd-fail-disk-path-too-long: ${DISK_PATH_LONG} +run-fail-boot-name-too-long: ${BOOT_PATH_LONG} +run-fail-disk-path-too-long: ${DISK_PATH_LONG} ${BOOT_PATH_LONG} ${DISK_PATH_LONG}: mkdir -p ${@:H} @@ -51,6 +45,4 @@ clean: rm -f -- *.img rm -rf some -.PHONY: ${REGRESS_TARGETS} - .include <bsd.regress.mk> |