RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- [regress/Makefile] Remove BSDisms.

This commit is contained in:
Darren Tucker 2003-09-04 15:37:58 +10:00
parent 6d3921f64b
commit ebc3c13d40
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23,6 +23,7 @@
- [regress/sftp-cmds.sh] Use portable "test" option. - [regress/sftp-cmds.sh] Use portable "test" option.
- [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always
use Strictmodes no, wait longer for sshd startup. use Strictmodes no, wait longer for sshd startup.
- [regress/Makefile] Remove BSDisms.
20030903 20030903
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -1013,4 +1014,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2956 2003/09/04 05:35:48 dtucker Exp $ $Id: ChangeLog,v 1.2957 2003/09/04 05:37:58 dtucker Exp $

29
regress/Makefile
View File

@ -1,8 +1,14 @@
# $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $ # $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 OBJ ?= `pwd`
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec
tests: $(REGRESS_TARGETS)
CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
clean:
@for F in $(CLEANFILES); do rm -f $(OBJ)/$${F}; done
distclean: clean
LTESTS= connect \ LTESTS= connect \
proxy-connect \ proxy-connect \
@ -36,7 +42,7 @@ CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \
ssh_config ssh_proxy sshd_config sshd_proxy \ ssh_config ssh_proxy sshd_config sshd_proxy \
rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
ls.copy ls.copy remote_pid
#LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp #LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
@ -49,9 +55,9 @@ t2:
ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub
t3: t3:
ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub |\ ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
ssh-keygen -if /dev/stdin |\ ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
diff - ${.CURDIR}/rsa_openssh.pub rm -f ${.CURDIR}/rsa_secsh.pub
t4: t4:
ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\ ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
@ -74,10 +80,9 @@ t7: t7.out
ssh-keygen -lf t7.out > /dev/null ssh-keygen -lf t7.out > /dev/null
ssh-keygen -Bf t7.out > /dev/null ssh-keygen -Bf t7.out > /dev/null
.for t in ${LTESTS} t-exec: ${LTESTS:=.sh}
REGRESS_TARGETS+=t-${t} @if [ "x$?" = "x" ]; then exit 0; fi; \
t-${t}: for TEST in ""$?; do \
sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh echo "run test $${TEST}" ... 1>&2; \
.endfor (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
done
.include "bsd.regress.mk"