summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-03-04 01:46:48 +0000
committerDamien Miller <djm@mindrot.org>2018-03-04 12:47:42 +1100
commit7e4fadd3248d6bb7d39d6688c76a613d35d2efc1 (patch)
tree24be85389d25b7a702edd3f09b00ebcc2e39eae2 /regress
parent13ef4cf53f24753fe920832b990b25c9c9cd0530 (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
Diffstat (limited to 'regress')
-rw-r--r--regress/key-options.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh
index aa5f8bf97..5e3a4f66a 100644
--- a/regress/key-options.sh
+++ b/regress/key-options.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: key-options.sh,v 1.5 2018/03/02 02:53:27 djm Exp $ 1# $OpenBSD: key-options.sh,v 1.6 2018/03/04 01:46:48 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="key options" 4tid="key options"
@@ -32,9 +32,10 @@ expect_pty_succeed() {
32 fail "key option failed $which" 32 fail "key option failed $which"
33 else 33 else
34 r=`cat $OBJ/data` 34 r=`cat $OBJ/data`
35 if [ ! -e "$r" ]; then 35 case "$r" in
36 fail "key option failed $which (pty $r)" 36 /dev/*) ;;
37 fi 37 *) fail "key option failed $which (pty $r)" ;;
38 esac
38 fi 39 fi
39} 40}
40expect_pty_fail() { 41expect_pty_fail() {
@@ -49,6 +50,10 @@ expect_pty_fail() {
49 if [ -e "$r" ]; then 50 if [ -e "$r" ]; then
50 fail "key option failed $which (pty $r)" 51 fail "key option failed $which (pty $r)"
51 fi 52 fi
53 case "$r" in
54 /dev/*) fail "key option failed $which (pty $r)" ;;
55 *) ;;
56 esac
52 fi 57 fi
53} 58}
54# First ensure that we can allocate a pty by default. 59# First ensure that we can allocate a pty by default.