diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | regress/Makefile | 22 |
2 files changed, 16 insertions, 12 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20030909 | ||
2 | - (tim) [regress/Makefile] Fixes for building outside of a read-only | ||
3 | source tree. | ||
4 | |||
1 | 20030908 | 5 | 20030908 |
2 | - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and | 6 | - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and |
3 | _getlong in #ifndef | 7 | _getlong in #ifndef |
@@ -1044,4 +1048,4 @@ | |||
1044 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1048 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1045 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1049 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1046 | 1050 | ||
1047 | $Id: ChangeLog,v 1.2972 2003/09/08 23:11:33 tim Exp $ | 1051 | $Id: ChangeLog,v 1.2973 2003/09/09 13:07:10 tim Exp $ |
diff --git a/regress/Makefile b/regress/Makefile index 3e6a2483e..ce876d483 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -50,9 +50,9 @@ t1: | |||
50 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv | 50 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv |
51 | 51 | ||
52 | t2: | 52 | t2: |
53 | cat ${.CURDIR}/rsa_openssh.prv > t2.out | 53 | cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out |
54 | chmod 600 t2.out | 54 | chmod 600 $(OBJ)/t2.out |
55 | ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub | 55 | ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub |
56 | 56 | ||
57 | t3: | 57 | t3: |
58 | ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub | 58 | ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub |
@@ -68,17 +68,17 @@ t5: | |||
68 | awk '{print $$2}' | diff - ${.CURDIR}/t5.ok | 68 | awk '{print $$2}' | diff - ${.CURDIR}/t5.ok |
69 | 69 | ||
70 | t6: | 70 | t6: |
71 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > t6.out1 | 71 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1 |
72 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > t6.out2 | 72 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2 |
73 | chmod 600 t6.out1 | 73 | chmod 600 $(OBJ)/t6.out1 |
74 | ssh-keygen -yf t6.out1 | diff - t6.out2 | 74 | ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2 |
75 | 75 | ||
76 | t7.out: | 76 | $(OBJ)/t7.out: |
77 | ssh-keygen -q -t rsa -N '' -f $@ | 77 | ssh-keygen -q -t rsa -N '' -f $@ |
78 | 78 | ||
79 | t7: t7.out | 79 | t7: $(OBJ)/t7.out |
80 | ssh-keygen -lf t7.out > /dev/null | 80 | ssh-keygen -lf $(OBJ)/t7.out > /dev/null |
81 | ssh-keygen -Bf t7.out > /dev/null | 81 | ssh-keygen -Bf $(OBJ)/t7.out > /dev/null |
82 | 82 | ||
83 | t-exec: ${LTESTS:=.sh} | 83 | t-exec: ${LTESTS:=.sh} |
84 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 84 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |