diff options
| -rw-r--r-- | regress/sys/kern/kqueue/Makefile | 8 | ||||
| -rw-r--r-- | regress/sys/kern/kqueue/kqueue-pty.c | 17 | ||||
| -rw-r--r-- | regress/sys/kern/kqueue/main.c | 13 | ||||
| -rw-r--r-- | regress/sys/kern/kqueue/main.h | 4 |
4 files changed, 27 insertions, 15 deletions
diff --git a/regress/sys/kern/kqueue/Makefile b/regress/sys/kern/kqueue/Makefile index 1fc89a28a15..18fdc010a23 100644 --- a/regress/sys/kern/kqueue/Makefile +++ b/regress/sys/kern/kqueue/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2019/03/04 19:31:07 anton Exp $ +# $OpenBSD: Makefile,v 1.25 2019/03/04 19:33:41 anton Exp $ PROG= kqueue-test CFLAGS+=-Wall @@ -22,8 +22,8 @@ kq-tun: ${PROG} @EVENT_SHOW_METHOD=yes EVENT_NOPOLL=yes EVENT_NOKQUEUE=yes ${SUDO} ./${PROG} -t @EVENT_SHOW_METHOD=yes EVENT_NOSELECT=yes EVENT_NOKQUEUE=yes ${SUDO} ./${PROG} -t @-${SUDO} rm -f /dev/tun98 /dev/tun99 -kq-pty: ${PROG} - ${SUDO} ./${PROG} -T +kq-pty-1: ${PROG} + ${SUDO} ./${PROG} -T1 kq-signal: ${PROG} ./${PROG} -s kq-fdpass: ${PROG} @@ -47,7 +47,7 @@ TESTS+= kq-fork TESTS+= kq-invalid-timer TESTS+= kq-pipe TESTS+= kq-process -TESTS+= kq-pty +TESTS+= kq-pty-1 TESTS+= kq-random TESTS+= kq-regress-1 TESTS+= kq-regress-2 diff --git a/regress/sys/kern/kqueue/kqueue-pty.c b/regress/sys/kern/kqueue/kqueue-pty.c index 6b72ed5e288..7a2d7b7cb18 100644 --- a/regress/sys/kern/kqueue/kqueue-pty.c +++ b/regress/sys/kern/kqueue/kqueue-pty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kqueue-pty.c,v 1.8 2016/09/21 15:26:54 bluhm Exp $ */ +/* $OpenBSD: kqueue-pty.c,v 1.9 2019/03/04 19:33:41 anton Exp $ */ /* Written by Michael Shalayeff, 2003, Public Domain */ @@ -55,8 +55,8 @@ pty_check(int kq, struct kevent *ev, int n, int rm, int rs, int wm, int ws) return (0); } -int -do_pty(void) +static int +pty_rdrw(void) { struct kevent ev[4]; struct termios tt; @@ -115,3 +115,14 @@ do_pty(void) return (0); } + +int +do_pty(int n) +{ + switch (n) { + case 1: + return pty_rdrw(); + default: + errx(1, "unknown pty test number %d", n); + } +} diff --git a/regress/sys/kern/kqueue/main.c b/regress/sys/kern/kqueue/main.c index 1f124ddb956..72dbb1ffe00 100644 --- a/regress/sys/kern/kqueue/main.c +++ b/regress/sys/kern/kqueue/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.13 2018/08/13 06:36:29 anton Exp $ */ +/* $OpenBSD: main.c,v 1.14 2019/03/04 19:33:41 anton Exp $ */ /* * Written by Artur Grabowski <art@openbsd.org> 2002 Public Domain */ @@ -14,10 +14,10 @@ int main(int argc, char **argv) { extern char *__progname; - int r, ret, c; + int n, ret, c; ret = 0; - while ((c = getopt(argc, argv, "fFiIlpPrR:stT")) != -1) { + while ((c = getopt(argc, argv, "fFiIlpPrR:stT:")) != -1) { switch (c) { case 'f': ret |= check_inheritance(); @@ -44,8 +44,8 @@ main(int argc, char **argv) ret |= do_random(); break; case 'R': - r = strtonum(optarg, 1, INT_MAX, NULL); - ret |= do_regress(r); + n = strtonum(optarg, 1, INT_MAX, NULL); + ret |= do_regress(n); break; case 's': ret |= do_signal(); @@ -54,7 +54,8 @@ main(int argc, char **argv) ret |= do_tun(); break; case 'T': - ret |= do_pty(); + n = strtonum(optarg, 1, INT_MAX, NULL); + ret |= do_pty(n); break; default: fprintf(stderr, "usage: %s -[fFiIlpPrstT] [-R n]\n", diff --git a/regress/sys/kern/kqueue/main.h b/regress/sys/kern/kqueue/main.h index e4b5069680a..2ba12b4159b 100644 --- a/regress/sys/kern/kqueue/main.h +++ b/regress/sys/kern/kqueue/main.h @@ -1,4 +1,4 @@ -/* $OpenBSD: main.h,v 1.4 2018/08/13 06:36:29 anton Exp $ */ +/* $OpenBSD: main.h,v 1.5 2019/03/04 19:33:42 anton Exp $ */ /* * Written by Alexaner Bluhm <bluhm@openbsd.org> 2016 Public Domain */ @@ -21,7 +21,7 @@ int do_flock(void); int do_invalid_timer(void); int do_pipe(void); int do_process(void); -int do_pty(void); +int do_pty(int); int do_random(void); int do_regress(int); int do_signal(void); |