cvs commit: apr/test testpoll.c

[bnicholes]

bnicholes    2004/05/26 07:50:27

  Modified:    test     testpoll.c
  Log:
  Reverting a NetWare timeout patch
  
  Revision  Changes    Path
  1.33      +7 -12     apr/test/testpoll.c
  
  Index: testpoll.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testpoll.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- testpoll.c        25 May 2004 22:29:33 -0000      1.32
  +++ testpoll.c        26 May 2004 14:50:27 -0000      1.33
  @@ -27,11 +27,6 @@
    * 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];
  @@ -319,7 +314,7 @@
       int lrv;
       const apr_pollfd_t *descs = NULL;
   
  -    rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs);
  +    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
       ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
       ABTS_INT_EQUAL(tc, 0, lrv);
       ABTS_PTR_EQUAL(tc, NULL, descs);
  @@ -332,7 +327,7 @@
       int num;
       
       send_msg(s, sa, 0, tc);
  -    rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &num, &descs);
  +    rv = apr_pollset_poll(pollset, 0, &num, &descs);
       ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
       ABTS_INT_EQUAL(tc, 1, num);
       ABTS_PTR_NOTNULL(tc, descs);
  @@ -348,7 +343,7 @@
       const apr_pollfd_t *descs = NULL;
   
       recv_msg(s, 0, p, tc);
  -    rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs);
  +    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
       ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
       ABTS_INT_EQUAL(tc, 0, lrv);
       ABTS_PTR_EQUAL(tc, NULL, descs);
  @@ -362,7 +357,7 @@
       
       send_msg(s, sa, 2, tc);
       send_msg(s, sa, 5, tc);
  -    rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &num, &descs);
  +    rv = apr_pollset_poll(pollset, 0, &num, &descs);
       ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
       ABTS_INT_EQUAL(tc, 2, num);
       ABTS_PTR_NOTNULL(tc, descs);
  @@ -381,7 +376,7 @@
       recv_msg(s, 2, p, tc);
       recv_msg(s, 5, p, tc);
   
  -    rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs);
  +    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
       ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
       ABTS_INT_EQUAL(tc, 0, lrv);
       ABTS_PTR_EQUAL(tc, NULL, descs);
  @@ -394,7 +389,7 @@
       int num;
       
       send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
  -    rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &num, &descs);
  +    rv = apr_pollset_poll(pollset, 0, &num, &descs);
       ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
       ABTS_INT_EQUAL(tc, 1, num);
       ABTS_PTR_NOTNULL(tc, descs);
  @@ -411,7 +406,7 @@
   
       recv_msg(s, LARGE_NUM_SOCKETS - 1, p, tc);
   
  -    rv = apr_pollset_poll(pollset, SOCK_TIMEOUT, &lrv, &descs);
  +    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
       ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
       ABTS_INT_EQUAL(tc, 0, lrv);
       ABTS_PTR_EQUAL(tc, NULL, descs);