summaryrefslogtreecommitdiff
path: root/regress/sys/net
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2016-11-09 12:43:37 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2016-11-09 12:43:37 +0000
commit0c2ee8743cf83fe2eda924324738039834f01120 (patch)
tree96157c2e6394df13849e3d8446cc9f11d17bfea4 /regress/sys/net
parentb4eb1826889ac2ad0ce83b3b8593d0a3750213b2 (diff)
Use netstat -n in target check-setup to avoid DNS timeout.
Requested by mpi@
Diffstat (limited to 'regress/sys/net')
-rw-r--r--regress/sys/net/pf_forward/Makefile8
-rw-r--r--regress/sys/net/pf_state/Makefile6
2 files changed, 7 insertions, 7 deletions
diff --git a/regress/sys/net/pf_forward/Makefile b/regress/sys/net/pf_forward/Makefile
index 4d530aab2c2..6b1c875603d 100644
--- a/regress/sys/net/pf_forward/Makefile
+++ b/regress/sys/net/pf_forward/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2016/10/26 19:14:28 bluhm Exp $
+# $OpenBSD: Makefile,v 1.19 2016/11/09 12:43:36 bluhm Exp $
# The following ports must be installed:
#
@@ -419,12 +419,12 @@ check-setup-eco:
.endfor
.for af in inet inet6
.for proto in udp tcp
- ssh ${ECO_SSH} netstat -a -f ${af} -p ${proto} | fgrep ' *.echo '
+ ssh ${ECO_SSH} netstat -na -f ${af} -p ${proto} | fgrep ' *.7 '
.endfor
.endfor
.for ip in ECO_IN ECO_OUT RTT_IN
- ssh ${ECO_SSH} netstat -av -f inet -p udp | fgrep ' ${${ip}}.echo '
- ssh ${ECO_SSH} netstat -av -f inet6 -p udp | fgrep ' ${${ip}6}.echo '
+ ssh ${ECO_SSH} netstat -nav -f inet -p udp | fgrep ' ${${ip}}.7 '
+ ssh ${ECO_SSH} netstat -nav -f inet6 -p udp | fgrep ' ${${ip}6}.7 '
.endfor
.include <bsd.regress.mk>
diff --git a/regress/sys/net/pf_state/Makefile b/regress/sys/net/pf_state/Makefile
index eb4d1543f6c..1e36cf5cbf0 100644
--- a/regress/sys/net/pf_state/Makefile
+++ b/regress/sys/net/pf_state/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/10/20 16:31:37 bluhm Exp $
+# $OpenBSD: Makefile,v 1.3 2016/11/09 12:43:36 bluhm Exp $
# The following ports must be installed:
#
@@ -21,7 +21,7 @@ regress:
# This test needs a manual setup of two machines
# Set up machines: LOCAL REMOTE
# LOCAL is the machine where this makefile is running.
-# REMOTE is running OpenBSD with echo and chargen server to test PMTU
+# REMOTE is running OpenBSD with echo server to test PMTU
# FAKE is an non existing machine in a non existing network.
# REMOTE_SSH is the hostname to log in on the REMOTE machine.
@@ -116,7 +116,7 @@ check-setup-remote:
.for ip in FAKE_NET FAKE_NET_ADDR
ssh ${REMOTE_SSH} route -n get -inet ${${ip}} | fgrep -q 'gateway: ${LOCAL_ADDR}' # ${ip} LOCAL_ADDR
.endfor
- ssh ${ECO_SSH} netstat -a -f inet -p tcp | fgrep ' *.echo '
+ ssh ${REMOTE_SSH} netstat -na -f inet -p tcp | fgrep ' *.7 '
ssh ${REMOTE_SSH} ${SUDO} pfctl -sr | grep '^anchor "regress" all$$'
ssh ${REMOTE_SSH} ${SUDO} pfctl -si | grep '^Status: Enabled '