diff options
| author | veego <veego@NetBSD.org> | 1998-05-29 20:57:10 +0000 |
|---|---|---|
| committer | veego <veego@NetBSD.org> | 1998-05-29 20:57:10 +0000 |
| commit | e8450f8d3bd2081e92709b5a2c19d873eaebd84e (patch) | |
| tree | 193a5b6047d5bb7725a17a105079b763d322b816 /usr.sbin/ipf | |
| parent | 8ed932e1118de6f5dbb98d451bfd4f6ef3137b96 (diff) | |
A little better support to make it work in an NetBSD tree.
Diffstat (limited to 'usr.sbin/ipf')
| -rw-r--r-- | usr.sbin/ipf/ipftest/test/dotest | 16 | ||||
| -rw-r--r-- | usr.sbin/ipf/ipftest/test/hextest | 16 | ||||
| -rw-r--r-- | usr.sbin/ipf/ipftest/test/itest | 16 |
3 files changed, 36 insertions, 12 deletions
diff --git a/usr.sbin/ipf/ipftest/test/dotest b/usr.sbin/ipf/ipftest/test/dotest index 360e5baf261..ff495f96948 100644 --- a/usr.sbin/ipf/ipftest/test/dotest +++ b/usr.sbin/ipf/ipftest/test/dotest @@ -1,7 +1,4 @@ #!/bin/sh -# -# $NetBSD: dotest,v 1.2 1998/01/09 08:09:28 perry Exp $ -# if [ -f /usr/ucb/touch ] ; then TOUCH=/usr/ucb/touch else @@ -13,10 +10,21 @@ else fi fi fi + +if [ -f ../ipftest ] ; then + IPFTEST=../ipftest +else + if [ -f /usr/sbin/ipftest ] ; then + IPFTEST=/usr/sbin/ipftest + else + IPFTEST=ipftest + fi +fi + echo "$1..."; /bin/cp /dev/null results/$1 ( while read rule; do - echo "$rule" | ../ipftest -br - -i input/$1 >> results/$1; + echo "$rule" | $IPFTEST -br - -i input/$1 >> results/$1; if [ $? -ne 0 ] ; then exit 1; fi diff --git a/usr.sbin/ipf/ipftest/test/hextest b/usr.sbin/ipf/ipftest/test/hextest index 3a86507e99e..422bca802b3 100644 --- a/usr.sbin/ipf/ipftest/test/hextest +++ b/usr.sbin/ipf/ipftest/test/hextest @@ -1,7 +1,4 @@ #!/bin/sh -# -# $NetBSD: hextest,v 1.2 1998/01/09 08:09:29 perry Exp $ -# if [ -f /usr/ucb/touch ] ; then TOUCH=/usr/ucb/touch else @@ -13,10 +10,21 @@ else fi fi fi + +if [ -f ../ipftest ] ; then + IPFTEST=../ipftest +else + if [ -f /usr/sbin/ipftest ] ; then + IPFTEST=/usr/sbin/ipftest + else + IPFTEST=ipftest + fi +fi + echo "$1..."; /bin/cp /dev/null results/$1 ( while read rule; do - echo "$rule" | ../ipftest -br - -Hi input/$1 >> results/$1; + echo "$rule" | $IPFTEST -br - -Hi input/$1 >> results/$1; done ) < regress/$1 cmp expected/$1 results/$1 status=$? diff --git a/usr.sbin/ipf/ipftest/test/itest b/usr.sbin/ipf/ipftest/test/itest index 8e9962d920d..d7ff63c26e3 100644 --- a/usr.sbin/ipf/ipftest/test/itest +++ b/usr.sbin/ipf/ipftest/test/itest @@ -1,7 +1,4 @@ #!/bin/sh -# -# $NetBSD: itest,v 1.2 1998/01/09 08:09:30 perry Exp $ -# if [ -f /usr/ucb/touch ] ; then TOUCH=/usr/ucb/touch else @@ -13,9 +10,20 @@ else fi fi fi + +if [ -f ../ipf ] ; then + IPF=../ipf +else + if [ -f /usr/sbin/ipf ] ; then + IPF=/usr/sbin/ipf + else + IPF=ipf + fi +fi + echo "$1..."; /bin/cp /dev/null results/$1 -../ipf -nvf regress/$1 2>/dev/null > results/$1 +$IPF -nvf regress/$1 2>/dev/null > results/$1 cmp expected/$1 results/$1 status=$? if [ $status = 0 ] ; then |
