summaryrefslogtreecommitdiff
path: root/regress/Makefile
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-01-27 23:07:25 +1100
committerDamien Miller <djm@mindrot.org>2015-01-27 23:07:25 +1100
commit358964f3082fb90b2ae15bcab07b6105cfad5a43 (patch)
treee84ffb7e29b05bac1c0dcce06541282110514aeb /regress/Makefile
parenta2c95c1bf33ea53038324d1fdd774bc953f98236 (diff)
use ssh-keygen under test rather than system's
Diffstat (limited to 'regress/Makefile')
-rw-r--r--regress/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 58bcb38b..b30a7133 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -100,7 +100,7 @@ CLEANFILES= t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
sftp-server.sh sftp-server.log sftp.log setuid-allowed \
data ed25519-agent ed25519-agent.pub key.ed25519-512 \
key.ed25519-512.pub netcat host_krl_* host_revoked_* \
- kh.* user_*key*
+ kh.* user_*key* agent-key.* known_hosts.* hkr.*
SUDO_CLEAN+= /var/run/testdata_${USER} /var/run/keycommand_${USER}
@@ -178,10 +178,10 @@ t11:
awk '{print $$2}' | diff - ${.CURDIR}/t11.ok
t12.out:
- ssh-keygen -q -t ed25519 -N '' -C 'test-comment-1234' -f $@
+ ${TEST_SSH_SSHKEYGEN} -q -t ed25519 -N '' -C 'test-comment-1234' -f $@
t12: t12.out
- ssh-keygen -lf t12.out.pub | grep -q test-comment-1234
+ ${TEST_SSH_SSHKEYGEN} -lf t12.out.pub | grep -q test-comment-1234
t-exec: ${LTESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \