diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-03-04 01:46:48 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-03-04 12:47:42 +1100 |
| commit | 7e4fadd3248d6bb7d39d6688c76a613d35d2efc1 (patch) | |
| tree | 24be85389d25b7a702edd3f09b00ebcc2e39eae2 | |
| parent | 13ef4cf53f24753fe920832b990b25c9c9cd0530 (diff) | |
upstream: for the pty control tests, just check that the PTY path
points to something in /dev (rather than checking the device node itself);
makes life easier for portable, where systems with dynamic ptys can delete
nodes before we get around to testing their existence.
OpenBSD-Regress-ID: b1e455b821e62572bccd98102f8dd9d09bb94994
| -rw-r--r-- | regress/key-options.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh index aa5f8bf9..5e3a4f66 100644 --- a/regress/key-options.sh +++ b/regress/key-options.sh @@ -1,4 +1,4 @@ -# $OpenBSD: key-options.sh,v 1.5 2018/03/02 02:53:27 djm Exp $ +# $OpenBSD: key-options.sh,v 1.6 2018/03/04 01:46:48 djm Exp $ # Placed in the Public Domain. tid="key options" @@ -32,9 +32,10 @@ expect_pty_succeed() { fail "key option failed $which" else r=`cat $OBJ/data` - if [ ! -e "$r" ]; then - fail "key option failed $which (pty $r)" - fi + case "$r" in + /dev/*) ;; + *) fail "key option failed $which (pty $r)" ;; + esac fi } expect_pty_fail() { @@ -49,6 +50,10 @@ expect_pty_fail() { if [ -e "$r" ]; then fail "key option failed $which (pty $r)" fi + case "$r" in + /dev/*) fail "key option failed $which (pty $r)" ;; + *) ;; + esac fi } # First ensure that we can allocate a pty by default. |