From de0e953759035ca7477eacbc0f099f3cd7d8d497 Mon Sep 17 00:00:00 2001 From: Alexander Bluhm Date: Wed, 15 Jan 2020 20:47:15 +0000 Subject: Do not create files as dependency of .BEGIN rule. Noticed by deraadt@ with make obj in regress. --- regress/sys/netinet/frag/Makefile | 6 +++--- regress/sys/netinet/ipsec/Makefile | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'regress/sys/netinet') diff --git a/regress/sys/netinet/frag/Makefile b/regress/sys/netinet/frag/Makefile index 990c26fb6de..ae55e9951ff 100644 --- a/regress/sys/netinet/frag/Makefile +++ b/regress/sys/netinet/frag/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/05/10 02:22:34 bluhm Exp $ +# $OpenBSD: Makefile,v 1.6 2020/01/15 20:47:13 bluhm Exp $ # The following ports must be installed: # @@ -6,7 +6,7 @@ # scapy powerful interactive packet manipulation in python .if ! exists(/usr/local/bin/python2.7) || ! exists(/usr/local/bin/scapy) -.BEGIN: addr.py +.BEGIN: @true regress: @echo Install python and the scapy module for additional tests. @@ -82,7 +82,7 @@ stamp-stack: 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 | /sbin/pfctl -n -f - cat addr.py ${.CURDIR}/pf.conf | \ ssh ${REMOTE_SSH} ${SUDO} pfctl -a regress -f - -ssh ${REMOTE_SSH} ${SUDO} pfctl -e diff --git a/regress/sys/netinet/ipsec/Makefile b/regress/sys/netinet/ipsec/Makefile index d9e5a8d4bd8..a914125ef8c 100644 --- a/regress/sys/netinet/ipsec/Makefile +++ b/regress/sys/netinet/ipsec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2020/01/08 21:28:01 bluhm Exp $ +# $OpenBSD: Makefile,v 1.26 2020/01/15 20:47:13 bluhm Exp $ # This test needs a manual setup of four machines, the make # target create-setup can be used to distribute the configuration. @@ -162,7 +162,7 @@ regress: @echo SKIPPED .elif make (regress) || make (all) -.BEGIN: ipsec.conf addr.py +.BEGIN: @echo ${SUDO} true ssh -t ${IPS_SSH} ${SUDO} true @@ -195,7 +195,7 @@ 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 | ipsecctl -n -f - + cat addr.py ${.CURDIR}/ipsec.conf | /sbin/ipsecctl -n -f - ${SUDO} ipsecctl -F cat addr.py ${.CURDIR}/ipsec.conf | ${SUDO} ipsecctl -f - ssh ${IPS_SSH} ${SUDO} ipsecctl -F @@ -206,7 +206,7 @@ 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 | pfctl -n -f - + 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 >$@ -- cgit v1.2.3