diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2004-05-25 22:29:33 +0000 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2004-05-25 22:29:33 +0000 |
| commit | 24773dec8dece03b1f2f2e530758756c79c0baf9 (patch) | |
| tree | 9f77744ec375d6f386523cbefd553c8d323250ea /test/testpoll.c | |
| parent | 0de88d63a2854acfeef6d33b724b04bad94f235a (diff) | |
| download | apr-24773dec8dece03b1f2f2e530758756c79c0baf9.tar.gz | |
A timeout value of 0 causes select() on NetWare to return immediately with a timeout error. So give NetWare a little time.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@65130 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/testpoll.c')
| -rw-r--r-- | test/testpoll.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/test/testpoll.c b/test/testpoll.c index 23a824dbd..0b866c618 100644 --- a/test/testpoll.c +++ b/test/testpoll.c @@ -27,6 +27,11 @@ * 64, the test will fail even though the code is correct. */ #define LARGE_NUM_SOCKETS 50 +#ifdef NETWARE +#define SOCK_TIMEOUT 1000 +#else +#define SOCK_TIMEOUT 0 +#endif static apr_socket_t *s[LARGE_NUM_SOCKETS]; static apr_sockaddr_t *sa[LARGE_NUM_SOCKETS]; @@ -314,7 +319,7 @@ static void nomessage_pollset(abts_case *tc, void *data) int lrv; const apr_pollfd_t *descs = NULL; - rv = apr_pollset_poll(pollset, 0, &lrv, &descs); + rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs); ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv)); ABTS_INT_EQUAL(tc, 0, lrv); ABTS_PTR_EQUAL(tc, NULL, descs); @@ -327,7 +332,7 @@ static void send0_pollset(abts_case *tc, void *data) int num; send_msg(s, sa, 0, tc); - rv = apr_pollset_poll(pollset, 0, &num, &descs); + rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &num, &descs); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); ABTS_INT_EQUAL(tc, 1, num); ABTS_PTR_NOTNULL(tc, descs); @@ -343,7 +348,7 @@ static void recv0_pollset(abts_case *tc, void *data) const apr_pollfd_t *descs = NULL; recv_msg(s, 0, p, tc); - rv = apr_pollset_poll(pollset, 0, &lrv, &descs); + rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs); ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv)); ABTS_INT_EQUAL(tc, 0, lrv); ABTS_PTR_EQUAL(tc, NULL, descs); @@ -357,7 +362,7 @@ static void send_middle_pollset(abts_case *tc, void *data) send_msg(s, sa, 2, tc); send_msg(s, sa, 5, tc); - rv = apr_pollset_poll(pollset, 0, &num, &descs); + rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &num, &descs); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); ABTS_INT_EQUAL(tc, 2, num); ABTS_PTR_NOTNULL(tc, descs); @@ -376,7 +381,7 @@ static void clear_middle_pollset(abts_case *tc, void *data) recv_msg(s, 2, p, tc); recv_msg(s, 5, p, tc); - rv = apr_pollset_poll(pollset, 0, &lrv, &descs); + rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs); ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv)); ABTS_INT_EQUAL(tc, 0, lrv); ABTS_PTR_EQUAL(tc, NULL, descs); @@ -389,7 +394,7 @@ static void send_last_pollset(abts_case *tc, void *data) int num; send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); - rv = apr_pollset_poll(pollset, 0, &num, &descs); + rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &num, &descs); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); ABTS_INT_EQUAL(tc, 1, num); ABTS_PTR_NOTNULL(tc, descs); @@ -406,7 +411,7 @@ static void clear_last_pollset(abts_case *tc, void *data) recv_msg(s, LARGE_NUM_SOCKETS - 1, p, tc); - rv = apr_pollset_poll(pollset, 0, &lrv, &descs); + rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs); ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv)); ABTS_INT_EQUAL(tc, 0, lrv); ABTS_PTR_EQUAL(tc, NULL, descs); |