Skip to content

Commit 52712d5

Browse files
committed
upstream: just skip the test if $PATH or $HOME has whitespace in it
OpenBSD-Regress-ID: ccf75a29d1a300a35f63be0e4f11ad5276756275
1 parent a8eac05 commit 52712d5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

regress/ssh-tty.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ FAKEHOME="$OBJ/.fakehome"
1010
rm -rf "$FAKEHOME"
1111
mkdir -m 0700 -p "$FAKEHOME"
1212

13+
case "${PATH}${HOME}" in
14+
*\ *|*\t*) skip "\$PATH or \$HOME has whitespace, not supported in this test";;
15+
esac
16+
1317
# tmux stuff
1418
TMUX=${TMUX:-tmux}
1519
type $TMUX >/dev/null || skip "tmux not found"
16-
CLEANENV="env -i HOME='$HOME' LOGNAME='$USER' USER='$USER' PATH='$PATH' SHELL='$SHELL'"
20+
CLEANENV="env -i HOME=$HOME LOGNAME=$USER USER=$USER PATH=$PATH SHELL=$SHELL"
1721
TMUX_TEST="$CLEANENV $TMUX -f/dev/null -Lopenssh-regress-ssh-tty"
1822
sess="regress-ssh-tty$$"
1923

@@ -59,6 +63,7 @@ wait_for_regex() {
5963
string="$1"
6064
errors_are_fatal="$2"
6165
for x in 1 2 3 4 5 6 7 8 9 10 ; do
66+
set -x
6267
$TMUX_TEST capture-pane -pt $sess | grep "$string" >/dev/null
6368
[ $? -eq 0 ] && return
6469
sleep 1

0 commit comments

Comments
 (0)