diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2010-01-03 23:02:35 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2010-01-03 23:02:35 +0000 |
| commit | 8977d0817d5af955632b410a7411fb89d1143f34 (patch) | |
| tree | 6020a25c6cbdc9723bf7c4d233671b1bf9098adc /regress/lib/libpthread | |
| parent | e23c708deff1c839bfed8d151c04028b4b9b6687 (diff) | |
Use CHECKx macro and enable setsockopt tests.
Diffstat (limited to 'regress/lib/libpthread')
| -rw-r--r-- | regress/lib/libpthread/Makefile | 6 | ||||
| -rw-r--r-- | regress/lib/libpthread/setsockopt/3/setsockopt3.c | 4 | ||||
| -rw-r--r-- | regress/lib/libpthread/setsockopt/3a/setsockopt3a.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/regress/lib/libpthread/Makefile b/regress/lib/libpthread/Makefile index c52b45481e0..8c92bd39547 100644 --- a/regress/lib/libpthread/Makefile +++ b/regress/lib/libpthread/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2006/10/13 18:04:07 kurt Exp $ +# $OpenBSD: Makefile,v 1.27 2010/01/03 23:02:33 fgsch Exp $ SUBDIR= blocked_close blocked_dup2 blocked_shutdown cancel cancel2 close \ closefrom close_race cwd dup2_race execve fork group \ @@ -6,8 +6,8 @@ SUBDIR= blocked_close blocked_dup2 blocked_shutdown cancel cancel2 close \ preemption preemption_float \ pthread_atfork pthread_cond_timedwait pthread_create \ pthread_join pthread_kill pthread_mutex pthread_specific readdir \ - select setjmp signal sigdeliver siginfo signodefer sigsuspend \ - sigwait sleep socket stdarg stdio switch system + select setjmp setsockopt signal sigdeliver siginfo signodefer \ + sigsuspend sigwait sleep socket stdarg stdio switch system # Not available or disabled: fcntl, getaddrinfo, pause, pw, sigmask, stdfiles diff --git a/regress/lib/libpthread/setsockopt/3/setsockopt3.c b/regress/lib/libpthread/setsockopt/3/setsockopt3.c index 5c249f9bff5..fc712e81d16 100644 --- a/regress/lib/libpthread/setsockopt/3/setsockopt3.c +++ b/regress/lib/libpthread/setsockopt/3/setsockopt3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setsockopt3.c,v 1.1 2009/12/26 01:34:18 fgsch Exp $ */ +/* $OpenBSD: setsockopt3.c,v 1.2 2010/01/03 23:02:33 fgsch Exp $ */ /* * Federico G. Schwindt <fgsch@openbsd.org>, 2009. Public Domain. */ @@ -39,7 +39,7 @@ sock_connect(void *arg) } ASSERTe(wait(&status), == child_pid); ASSERT(WIFEXITED(status)); - ASSERT(WEXITSTATUS(status) == 0); + CHECKr(WEXITSTATUS(status)); return (NULL); } diff --git a/regress/lib/libpthread/setsockopt/3a/setsockopt3a.c b/regress/lib/libpthread/setsockopt/3a/setsockopt3a.c index 0ec37e01f57..b7282415fb1 100644 --- a/regress/lib/libpthread/setsockopt/3a/setsockopt3a.c +++ b/regress/lib/libpthread/setsockopt/3a/setsockopt3a.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setsockopt3a.c,v 1.1 2009/12/26 01:34:18 fgsch Exp $ */ +/* $OpenBSD: setsockopt3a.c,v 1.2 2010/01/03 23:02:34 fgsch Exp $ */ /* * Federico G. Schwindt <fgsch@openbsd.org>, 2009. Public Domain. */ @@ -54,11 +54,11 @@ sock_accept(void *arg) CHECKe(connect(s, (struct sockaddr *)&sin, sizeof(sin))); to.tv_sec = 2; to.tv_usec = 0.5 * 1e6; - ASSERT(check_timeout(s, 3, &to) == 0); + CHECKr(check_timeout(s, 3, &to)); CHECKe(s2 = dup(s)); CHECKe(s3 = fcntl(s, F_DUPFD, s)); - ASSERT(check_timeout(s2, 3, &to) == 0); - ASSERT(check_timeout(s3, 3, &to) == 0); + CHECKr(check_timeout(s2, 3, &to)); + CHECKr(check_timeout(s3, 3, &to)); return (NULL); } |