summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2021-09-30 04:22:51 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2021-09-30 04:22:51 +0000
commit615fefc06cf67fee1fbf1963468d097eed5801c7 (patch)
tree435368d2bdb46889c2c62734d6c036f38240b958
parent96923af178aae961a8acca3c39a6cbb2c1ceb281 (diff)
Use "skip" instead of "fatal" if SUDO isn't set for the *-command tests.
This means running "make tests" without SUDO set will perform all of the tests that it can instead of failing on the ones it cannot run.
-rw-r--r--regress/usr.bin/ssh/keys-command.sh4
-rw-r--r--regress/usr.bin/ssh/principals-command.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/keys-command.sh b/regress/usr.bin/ssh/keys-command.sh
index 563dcb97d9a..87d5f737bb8 100644
--- a/regress/usr.bin/ssh/keys-command.sh
+++ b/regress/usr.bin/ssh/keys-command.sh
@@ -1,10 +1,10 @@
-# $OpenBSD: keys-command.sh,v 1.7 2021/09/01 00:50:27 dtucker Exp $
+# $OpenBSD: keys-command.sh,v 1.8 2021/09/30 04:22:50 dtucker Exp $
# Placed in the Public Domain.
tid="authorized keys from command"
if [ -z "$SUDO" -a ! -w /var/run ]; then
- fatal "need SUDO to create file in /var/run, test won't work without"
+ skip "need SUDO to create file in /var/run, test won't work without"
fi
rm -f $OBJ/keys-command-args
diff --git a/regress/usr.bin/ssh/principals-command.sh b/regress/usr.bin/ssh/principals-command.sh
index 8fad2718bf9..baa79072ec2 100644
--- a/regress/usr.bin/ssh/principals-command.sh
+++ b/regress/usr.bin/ssh/principals-command.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: principals-command.sh,v 1.11 2019/12/16 02:39:05 djm Exp $
+# $OpenBSD: principals-command.sh,v 1.12 2021/09/30 04:22:50 dtucker Exp $
# Placed in the Public Domain.
tid="authorized principals command"
@@ -7,7 +7,7 @@ rm -f $OBJ/user_ca_key* $OBJ/cert_user_key*
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
if [ -z "$SUDO" -a ! -w /var/run ]; then
- fatal "need SUDO to create file in /var/run, test won't work without"
+ skip "need SUDO to create file in /var/run, test won't work without"
fi
case "$SSH_KEYTYPES" in