RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
dtucker@openbsd.org 2021-09-30 04:22:50 +00:00 committed by Darren Tucker
parent bb754b470c
commit ece2fbe486
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
regress/keys-command.sh
View File

@ -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. # Placed in the Public Domain.
tid="authorized keys from command" tid="authorized keys from command"
if [ -z "$SUDO" -a ! -w /var/run ]; then if [ -z "$SUDO" -a ! -w /var/run ]; then
echo "skipped (SUDO not set)" skip "need SUDO to create file in /var/run, test won't work without"
echo "need SUDO to create file in /var/run, test won't work without"
exit 0
fi fi
rm -f $OBJ/keys-command-args rm -f $OBJ/keys-command-args

6
regress/principals-command.sh
View File

@ -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. # Placed in the Public Domain.
tid="authorized principals command" 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 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
if [ -z "$SUDO" -a ! -w /var/run ]; then if [ -z "$SUDO" -a ! -w /var/run ]; then
echo "skipped (SUDO not set)" skip "need SUDO to create file in /var/run, test won't work without"
echo "need SUDO to create file in /var/run, test won't work without"
exit 0
fi fi
case "$SSH_KEYTYPES" in case "$SSH_KEYTYPES" in