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 58bcb38b6..b30a7133b 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 \
100 sftp-server.sh sftp-server.log sftp.log setuid-allowed \ 100 sftp-server.sh sftp-server.log sftp.log setuid-allowed \
101 data ed25519-agent ed25519-agent.pub key.ed25519-512 \ 101 data ed25519-agent ed25519-agent.pub key.ed25519-512 \
102 key.ed25519-512.pub netcat host_krl_* host_revoked_* \ 102 key.ed25519-512.pub netcat host_krl_* host_revoked_* \
103 kh.* user_*key* 103 kh.* user_*key* agent-key.* known_hosts.* hkr.*
104 104
105SUDO_CLEAN+= /var/run/testdata_${USER} /var/run/keycommand_${USER} 105SUDO_CLEAN+= /var/run/testdata_${USER} /var/run/keycommand_${USER}
106 106
@@ -178,10 +178,10 @@ t11:
178 awk '{print $$2}' | diff - ${.CURDIR}/t11.ok 178 awk '{print $$2}' | diff - ${.CURDIR}/t11.ok
179 179
180t12.out: 180t12.out:
181 ssh-keygen -q -t ed25519 -N '' -C 'test-comment-1234' -f $@ 181 ${TEST_SSH_SSHKEYGEN} -q -t ed25519 -N '' -C 'test-comment-1234' -f $@
182 182
183t12: t12.out 183t12: t12.out
184 ssh-keygen -lf t12.out.pub | grep -q test-comment-1234 184 ${TEST_SSH_SSHKEYGEN} -lf t12.out.pub | grep -q test-comment-1234
185 185
186t-exec: ${LTESTS:=.sh} 186t-exec: ${LTESTS:=.sh}
187 @if [ "x$?" = "x" ]; then exit 0; fi; \ 187 @if [ "x$?" = "x" ]; then exit 0; fi; \