summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2019-05-10 14:45:01 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2019-05-10 14:45:01 +0000
commit8882d841ffa9522ff7d96d0502a5e1194f80484d (patch)
tree9fc48dc19bcdbae1c4bd7a9c98a6f28bfee1517e /regress
parent875d02c4bd4487072251e7dfb8440baae316ce9d (diff)
Python for scapy must be executed a bit differently in this test.
Diffstat (limited to 'regress')
-rw-r--r--regress/sys/netinet6/rip6cksum/Makefile10
-rwxr-xr-xregress/sys/netinet6/rip6cksum/sendrecv.py4
2 files changed, 4 insertions, 10 deletions
diff --git a/regress/sys/netinet6/rip6cksum/Makefile b/regress/sys/netinet6/rip6cksum/Makefile
index 97f97bea075..ac111c6dd5e 100644
--- a/regress/sys/netinet6/rip6cksum/Makefile
+++ b/regress/sys/netinet6/rip6cksum/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/05/10 02:22:34 bluhm Exp $
+# $OpenBSD: Makefile,v 1.3 2019/05/10 14:45:00 bluhm Exp $
# The following ports must be installed:
#
@@ -14,13 +14,7 @@ regress:
PROG = rip6cksum
WARNINGS = yes
-# Set variables so that make runs with and without obj directory.
-# Only do that if necessary to keep visible output short.
-.if ${.CURDIR} == ${.OBJDIR}
-PYTHON = python2.7 -u ./
-.else
-PYTHON = PYTHONPATH=${.OBJDIR} python2.7 -u ${.CURDIR}/
-.endif
+PYTHON = python2.7 -u ${.CURDIR}/
REGRESS_TARGETS += run-error-negative
run-error-negative:
diff --git a/regress/sys/netinet6/rip6cksum/sendrecv.py b/regress/sys/netinet6/rip6cksum/sendrecv.py
index f103f0e6efb..70e4499e52d 100755
--- a/regress/sys/netinet6/rip6cksum/sendrecv.py
+++ b/regress/sys/netinet6/rip6cksum/sendrecv.py
@@ -1,5 +1,5 @@
#!/usr/local/bin/python2.7
-# $OpenBSD: sendrecv.py,v 1.1 2019/05/09 15:54:31 bluhm Exp $
+# $OpenBSD: sendrecv.py,v 1.2 2019/05/10 14:45:00 bluhm Exp $
import os
from scapy.all import *
@@ -7,7 +7,7 @@ from struct import pack
import getopt, sys
def usage():
- print "raw6-sendrecv [-hi] [-c ckoff] [-r recvsz] [-s sendsz]"
+ print "sendrecv [-hi] [-c ckoff] [-r recvsz] [-s sendsz]"
print " -c ckoff set checksum offset within payload"
print " -h help, show usage"
print " -i expect icmp6 error message as response"