Make sure, tests using "file" work when obj/ directory is present.

4 files changed, 34 insertions, 35 deletions

diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 91e3d12096f..09cbaf0aefd 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2005/08/09 14:58:09 hshoexer Exp $
+# $OpenBSD: Makefile,v 1.6 2005/08/11 09:57:24 hshoexer Exp $
 
 # TARGETS
 # ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -18,25 +18,24 @@ SHELL=/bin/sh
 IPSEC_TARGETS+=ipsec${n}
 
 ipsec${n}:
-	ipsecctl -nv -f - < ${.CURDIR}/ipsec${n}.in | \
-	    diff -u ${.CURDIR}/ipsec${n}.ok /dev/stdin
-
+	cat ${.CURDIR}/ipsec${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+	    ipsecctl -nv -f - | diff -u ${.CURDIR}/ipsec${n}.ok /dev/stdin
 .endfor
 
 .for n in ${TCPMD5TESTS}
 TCPMD5_TARGETS+=tcpmd5${n}
 
 tcpmd5${n}:
-	ipsecctl -nv -f - < ${.CURDIR}/tcpmd5${n}.in | \
-	    diff -u ${.CURDIR}/tcpmd5${n}.ok /dev/stdin
+	cat ${.CURDIR}/tcpmd5${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+	    ipsecctl -nv -f - | diff -u ${.CURDIR}/tcpmd5${n}.ok /dev/stdin
 .endfor
 
 .for n in ${SATESTS}
 SA_TARGETS+=sa${n}
 
 sa${n}:
-	ipsecctl -nv -f - < ${.CURDIR}/sa${n}.in | \
-	    diff -u ${.CURDIR}/sa${n}.ok /dev/stdin
+	cat ${.CURDIR}/sa${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+	    ipsecctl -nv -f - | diff -u ${.CURDIR}/sa${n}.ok /dev/stdin
 .endfor
 
 ipsec:		${IPSEC_TARGETS}
diff --git a/regress/sbin/ipsecctl/sa5.in b/regress/sbin/ipsecctl/sa5.in
index ae9032fa8f2..8159e8e5882 100644
--- a/regress/sbin/ipsecctl/sa5.in
+++ b/regress/sbin/ipsecctl/sa5.in
@@ -1,18 +1,18 @@
 ah from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef:0xbeef1ead \
-	authkey file "ak256:ak256"
+	authkey file "DIR/ak256:DIR/ak256"
 ah from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef:0xbeef2ead auth hmac-md5 \
-	authkey file "ak128:ak128"
+	authkey file "DIR/ak128:DIR/ak128"
 ah from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef:0xbeef3ead auth hmac-ripemd160 \
-	authkey file "ak160:ak160"
+	authkey file "DIR/ak160:DIR/ak160"
 ah from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef:0xbeef4ead auth hmac-sha1 \
-	authkey file "ak160:ak160"
+	authkey file "DIR/ak160:DIR/ak160"
 ah from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef:0xbeef5ead auth hmac-sha2-256 \
-	authkey file "ak256:ak256"
+	authkey file "DIR/ak256:DIR/ak256"
 ah from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef:0xbeef6ead auth hmac-sha2-384 \
-	authkey file "ak384:ak384"
+	authkey file "DIR/ak384:DIR/ak384"
 ah from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef:0xbeef7ead auth hmac-sha2-512 \
-	authkey file "ak512:ak512"
+	authkey file "DIR/ak512:DIR/ak512"
 ah from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead auth md5 \
-	authkey file "ak128:ak128"
+	authkey file "DIR/ak128:DIR/ak128"
 ah from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead auth sha1 \
-	authkey file "ak160:ak160"
+	authkey file "DIR/ak160:DIR/ak160"
diff --git a/regress/sbin/ipsecctl/sa6.in b/regress/sbin/ipsecctl/sa6.in
index 46d0ec17ade..c0ae0dfd1f1 100644
--- a/regress/sbin/ipsecctl/sa6.in
+++ b/regress/sbin/ipsecctl/sa6.in
@@ -1,34 +1,34 @@
 esp from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef:0xbeef1ead \
-	authkey file "ak256:ak256" \
-	enckey file "ek160:ek160"
+	authkey file "DIR/ak256:DIR/ak256" \
+	enckey file "DIR/ek160:DIR/ek160"
 esp from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef:0xbeef2ead auth hmac-sha1 \
 	enc 3des-cbc \
-	authkey file "ak160:ak160" \
-	enckey file "ek192:ek192"
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek192:DIR/ek192"
 esp from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef:0xbeef3ead auth hmac-sha1 \
 	enc des-cbc \
-	authkey file "ak160:ak160" \
-	enckey file "ek64:ek64"
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek64:DIR/ek64"
 esp from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef:0xbeef4ead auth hmac-sha1 \
 	enc aes \
-	authkey file "ak160:ak160" \
-	enckey file "ek128:ek128"
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek128:DIR/ek128"
 esp from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef:0xbeef5ead auth hmac-sha1 \
 	enc aesctr \
-	authkey file "ak160:ak160" \
-	enckey file "ek160:ek160"
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek160:DIR/ek160"
 esp from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef:0xbeef6ead auth hmac-sha1 \
 	enc blowfish \
-	authkey file "ak160:ak160" \
-	enckey file "ek160:ek160"
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek160:DIR/ek160"
 esp from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef:0xbeef7ead auth hmac-sha1 \
 	enc cast128 \
-	authkey file "ak160:ak160" \
-	enckey file "ek128:ek128"
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek128:DIR/ek128"
 esp from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead auth hmac-sha1 \
 	enc null \
-	authkey file "ak160:ak160"
+	authkey file "DIR/ak160:DIR/ak160"
 esp from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead auth hmac-sha1 \
 	enc skipjack \
-	authkey file "ak160:ak160" \
-	enckey file "ek80:ek80"
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek80:DIR/ek80"
diff --git a/regress/sbin/ipsecctl/tcpmd53.in b/regress/sbin/ipsecctl/tcpmd53.in
index ca037ab4a25..4810c7e9df2 100644
--- a/regress/sbin/ipsecctl/tcpmd53.in
+++ b/regress/sbin/ipsecctl/tcpmd53.in
@@ -1 +1 @@
-tcpmd5 from 1.1.1.1 to 2.2.2.2 spi 0x2000:0x2001 authkey file "ak160:ak160"
+tcpmd5 from 1.1.1.1 to 2.2.2.2 spi 0x2000:0x2001 authkey file "DIR/ak160:DIR/ak160"