summaryrefslogtreecommitdiffstats
path: root/regress/sshfp-connect.sh
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2021-09-01 02:50:27 +0200
committerDarren Tucker <dtucker@dtucker.net>2021-09-01 03:40:43 +0200
commit8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59 (patch)
treefb2ac7b4d64b8d079962caecb83ca24ae220f352 /regress/sshfp-connect.sh
parentupstream: Specify path to PuTTY keys. (diff)
downloadopenssh-8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59.tar.xz
openssh-8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59.zip
upstream: Add a function to skip remaining tests.
Many tests skip tests for various reasons but not in a consistent way and don't always clean up, so add that and switch the tests that do that over. OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735
Diffstat (limited to 'regress/sshfp-connect.sh')
-rw-r--r--regress/sshfp-connect.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/sshfp-connect.sh b/regress/sshfp-connect.sh
index a6b6fab53..f78646922 100644
--- a/regress/sshfp-connect.sh
+++ b/regress/sshfp-connect.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: sshfp-connect.sh,v 1.3 2021/08/31 01:25:27 dtucker Exp $
+# $OpenBSD: sshfp-connect.sh,v 1.4 2021/09/01 00:50:27 dtucker Exp $
# Placed in the Public Domain.
# This test requires external setup and thus is skipped unless
@@ -25,9 +25,9 @@
tid="sshfp connect"
if ! $SSH -Q key-plain | grep ssh-rsa >/dev/null; then
- echo SKIPPED: RSA keys not supported.
+ skip "RSA keys not supported."
elif [ -z "${TEST_SSH_SSHFP_DOMAIN}" ]; then
- echo SKIPPED: TEST_SSH_SSHFP_DOMAIN not set.
+ skip "TEST_SSH_SSHFP_DOMAIN not set."
else
# Set RSA host key to match fingerprints above.
mv $OBJ/sshd_proxy $OBJ/sshd_proxy.orig