summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-01-06 17:48:53 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-01-06 17:48:53 +0000
commitc703dda6776c9c3085e07c31916c3fa690ffe9aa (patch)
tree1c56e63febf245d0ee6d4974efb3db0115ea935e
parent11576f3b84aa808f98ae31158505c13f61a8d3c4 (diff)
Use the *.in files in tests/
-rw-r--r--regress/sys/kern/execve/Makefile44
1 files changed, 29 insertions, 15 deletions
diff --git a/regress/sys/kern/execve/Makefile b/regress/sys/kern/execve/Makefile
index e11439cca18..04586373097 100644
--- a/regress/sys/kern/execve/Makefile
+++ b/regress/sys/kern/execve/Makefile
@@ -19,29 +19,43 @@ regress: test-empty test-nonexist \
test-goodscript test-scriptarg test-scriptarg-nospace \
test-goodaout test-truncaout
-test-empty: ${PROG} ${TD}/empty
- ${RP} ${TD}/empty | diff - ${OD}/empty
+test-empty: ${PROG} ${TD}/empty.in
+ @cp ${TD}/empty.in ${.OBJDIR}/empty
+ @chmod 555 ${.OBJDIR}/empty
+ ${RP} ${.OBJDIR}/empty | diff - ${OD}/empty
test-nonexist: ${PROG}
${RP} ${TD}/nonexistent | diff - ${OD}/nonexistent
-test-nonexistshell: ${PROG} ${TD}/nonexistshell
- ${RP} ${TD}/nonexistshell | diff - ${OD}/nonexistshell
+test-nonexistshell: ${PROG} ${TD}/nonexistshell.in
+ @cp ${TD}/nonexistshell.in ${.OBJDIR}/nonexistshell
+ @chmod 555 ${.OBJDIR}/nonexistshell
+ ${RP} ${.OBJDIR}/nonexistshell | diff - ${OD}/nonexistshell
-test-devnullscript: ${PROG} ${TD}/devnullscript
- ${RP} ${TD}/devnullscript | diff - ${OD}/devnullscript
+test-devnullscript: ${PROG} ${TD}/devnullscript.in
+ @cp ${TD}/devnullscript.in ${.OBJDIR}/devnullscript
+ @chmod 555 ${.OBJDIR}/devnullscript
+ ${RP} ${.OBJDIR}/devnullscript | diff - ${OD}/devnullscript
-test-badinterplen: ${PROG} ${TD}/badinterplen
- ${RP} ${TD}/badinterplen | diff - ${OD}/badinterplen
+test-badinterplen: ${PROG} ${TD}/badinterplen.in
+ @cp ${TD}/badinterplen.in ${.OBJDIR}/badinterplen
+ @chmod 555 ${.OBJDIR}/badinterplen
+ ${RP} ${.OBJDIR}/badinterplen | diff - ${OD}/badinterplen
-test-goodscript: ${PROG} ${TD}/goodscript
- ${RP} ${TD}/goodscript | diff - ${OD}/goodscript
+test-goodscript: ${PROG} ${TD}/goodscript.in
+ @cp ${TD}/goodscript.in ${.OBJDIR}/goodscript
+ @chmod 555 ${.OBJDIR}/goodscript
+ ${RP} ${.OBJDIR}/goodscript | diff - ${OD}/goodscript
-test-scriptarg: ${PROG} ${TD}/scriptarg
- ${RP} ${TD}/scriptarg 2>&1 | diff - ${OD}/scriptarg
+test-scriptarg: ${PROG} ${TD}/scriptarg.in
+ @cp ${TD}/scriptarg.in ${.OBJDIR}/scriptarg
+ @chmod 555 ${.OBJDIR}/scriptarg
+ ${RP} ${.OBJDIR}/scriptarg 2>&1 | diff - ${OD}/scriptarg
-test-scriptarg-nospace: ${PROG} ${TD}/scriptarg-nospace
- ${RP} ${TD}/scriptarg-nospace 2>&1 | diff - ${OD}/scriptarg-nospace
+test-scriptarg-nospace: ${PROG} ${TD}/scriptarg-nospace.in
+ @cp ${TD}/scriptarg-nospace.in ${.OBJDIR}/scriptarg-nospace
+ @chmod 555 ${.OBJDIR}/scriptarg-nospace
+ ${RP} ${.OBJDIR}/scriptarg-nospace 2>&1 | diff - ${OD}/scriptarg-nospace
goodaout: ${TD}/goodaout.c
${LINK.c} ${LDSTATIC} -o ${.TARGET} ${TD}/goodaout.c ${LDLIBS}
@@ -52,7 +66,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