^%#$#^%$ cvs missed this file in the previous commit.

1 files changed, 40 insertions, 26 deletions

diff --git a/regress/sys/kern/execve/Makefile b/regress/sys/kern/execve/Makefile
index 04586373097..72a3e65d5ee 100644
--- a/regress/sys/kern/execve/Makefile
+++ b/regress/sys/kern/execve/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 1995/04/20 22:43:03 cgd Exp $
+#	$OpenBSD: Makefile,v 1.3 2001/01/06 18:26:32 millert Exp $
 
 PROG=	doexec
 NOMAN=	noman, no way, man
@@ -9,8 +9,12 @@ RP=	${.OBJDIR}/${PROG}
 TD=	${.CURDIR}/tests
 OD=	${.CURDIR}/good
 
-all:	${PROG} goodaout truncaout
-CLEANFILES+= goodaout truncaout
+TESTFILES= empty nonexistshell devnullscript badinterplen goodscript \
+	   scriptarg scriptarg-nospace goodaout truncaout
+
+CLEANFILES+= ${TESTFILES}
+
+all:	${PROG} ${TESTFILES}
 
 install:
 
@@ -19,42 +23,52 @@ regress:	test-empty test-nonexist \
 		test-goodscript test-scriptarg test-scriptarg-nospace \
 		test-goodaout test-truncaout
 
-test-empty:	${PROG} ${TD}/empty.in
-	@cp ${TD}/empty.in ${.OBJDIR}/empty
-	@chmod 555 ${.OBJDIR}/empty
+empty: ${TD}/empty.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
+
+test-empty:	${PROG} empty
 	${RP} ${.OBJDIR}/empty | diff - ${OD}/empty
 
+nonexist: ${TD}/nonexist.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
+
 test-nonexist:	${PROG}
-	${RP} ${TD}/nonexistent | diff - ${OD}/nonexistent
+	${RP} ${.OBJDIR}/nonexistent | diff - ${OD}/nonexistent
+
+nonexistshell: ${TD}/nonexistshell.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
 
-test-nonexistshell: ${PROG} ${TD}/nonexistshell.in
-	@cp ${TD}/nonexistshell.in ${.OBJDIR}/nonexistshell
-	@chmod 555 ${.OBJDIR}/nonexistshell
+test-nonexistshell: ${PROG} nonexistshell
 	${RP} ${.OBJDIR}/nonexistshell | diff - ${OD}/nonexistshell
 
-test-devnullscript: ${PROG} ${TD}/devnullscript.in
-	@cp ${TD}/devnullscript.in ${.OBJDIR}/devnullscript
-	@chmod 555 ${.OBJDIR}/devnullscript
+devnullscript: ${TD}/devnullscript.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
+
+test-devnullscript: ${PROG} devnullscript
 	${RP} ${.OBJDIR}/devnullscript | diff - ${OD}/devnullscript
 
-test-badinterplen: ${PROG} ${TD}/badinterplen.in
-	@cp ${TD}/badinterplen.in ${.OBJDIR}/badinterplen
-	@chmod 555 ${.OBJDIR}/badinterplen
+badinterplen: ${TD}/badinterplen.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
+
+test-badinterplen: ${PROG} badinterplen
 	${RP} ${.OBJDIR}/badinterplen | diff - ${OD}/badinterplen
 
-test-goodscript: ${PROG} ${TD}/goodscript.in
-	@cp ${TD}/goodscript.in ${.OBJDIR}/goodscript
-	@chmod 555 ${.OBJDIR}/goodscript
+goodscript: ${TD}/goodscript.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
+
+test-goodscript: ${PROG} goodscript
 	${RP} ${.OBJDIR}/goodscript | diff - ${OD}/goodscript
 
-test-scriptarg: ${PROG} ${TD}/scriptarg.in
-	@cp ${TD}/scriptarg.in ${.OBJDIR}/scriptarg
-	@chmod 555 ${.OBJDIR}/scriptarg
+scriptarg: ${TD}/scriptarg.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
+
+test-scriptarg: ${PROG} scriptarg
 	${RP} ${.OBJDIR}/scriptarg 2>&1 | diff - ${OD}/scriptarg
 
-test-scriptarg-nospace: ${PROG} ${TD}/scriptarg-nospace.in
-	@cp ${TD}/scriptarg-nospace.in ${.OBJDIR}/scriptarg-nospace
-	@chmod 555 ${.OBJDIR}/scriptarg-nospace
+scriptarg-nospace: ${TD}/scriptarg-nospace.in
+	${INSTALL} -c -m 755 ${.ALLSRC} ${.TARGET}
+
+test-scriptarg-nospace: ${PROG} scriptarg-nospace
 	${RP} ${.OBJDIR}/scriptarg-nospace 2>&1 | diff - ${OD}/scriptarg-nospace
 
 goodaout: ${TD}/goodaout.c
@@ -66,7 +80,7 @@ test-goodaout: ${PROG} goodaout
 truncaout: goodaout
 	/bin/rm -rf truncaout
 	dd if=${.OBJDIR}/goodaout of=truncaout bs=16 count=1
-	@chmod a+x truncaout
+	chmod a+x truncaout
 
 test-truncaout: ${PROG} truncaout
 	${RP} ${.OBJDIR}/truncaout | diff - ${OD}/truncaout