summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2021-09-30 04:22:50 +0000
committerDarren Tucker <dtucker@dtucker.net>2021-10-01 14:55:12 +1000
commitece2fbe486164860de8df3f8b943cccca3085eff (patch)
treef5edc341647d13cb25afa0b59c074208c89c1943 /regress
parentbb754b470c360e787a99fb4e88e2668198e97b41 (diff)
upstream: 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. OpenBSD-Regress-ID: bd4dbbb02f34b2e8c890558ad4a696248def763a
Diffstat (limited to 'regress')
-rw-r--r--regress/keys-command.sh6
-rw-r--r--regress/principals-command.sh6
2 files changed, 4 insertions, 8 deletions
diff --git a/regress/keys-command.sh b/regress/keys-command.sh
index a3acf5e4..5feec172 100644
--- a/regress/keys-command.sh
+++ b/regress/keys-command.sh
@@ -1,12 +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
- echo "skipped (SUDO not set)"
- echo "need SUDO to create file in /var/run, test won't work without"
- exit 0
+ 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/principals-command.sh b/regress/principals-command.sh
index 5e535c13..a808f9c3 100644
--- a/regress/principals-command.sh
+++ b/regress/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,9 +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
- echo "skipped (SUDO not set)"
- echo "need SUDO to create file in /var/run, test won't work without"
- exit 0
+ skip "need SUDO to create file in /var/run, test won't work without"
fi
case "$SSH_KEYTYPES" in