cvs commit: apr/test testrand.c testlock.c

[jorton]

jorton      2002/12/06 05:35:36

  Modified:    test     testrand.c testlock.c
  Log:
  Use CuAssertSuccess for some rv==APR_SUCCESS checks which are currently
  failing on various platforms.
  
  Revision  Changes    Path
  1.8       +1 -1      apr/test/testrand.c
  
  Index: testrand.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testrand.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- testrand.c        24 Nov 2002 04:57:35 -0000      1.7
  +++ testrand.c        6 Dec 2002 13:35:36 -0000       1.8
  @@ -72,7 +72,7 @@
        */
       for (i = 1; i <= 8; i++) {
           rv = apr_generate_random_bytes(c, i * 255);
  -        CuAssertIntEquals(tc, APR_SUCCESS, rv);
  +        CuAssertSuccess(tc, "apr_generate_random_bytes failed", rv);
       }
   #endif
   }    
  
  
  
  1.22      +5 -5      apr/test/testlock.c
  
  Index: testlock.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testlock.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- testlock.c        3 Dec 2002 05:03:21 -0000       1.21
  +++ testlock.c        6 Dec 2002 13:35:36 -0000       1.22
  @@ -222,20 +222,20 @@
       apr_status_t s1, s2, s3, s4;
   
       s1 = apr_thread_rwlock_create(&rwlock, p);
  -    CuAssertIntEquals(tc, APR_SUCCESS, s1);
  +    CuAssertSuccess(tc, "rwlock_create", s1);
       CuAssertPtrNotNull(tc, rwlock);
   
       i = 0;
       x = 0;
   
       s1 = apr_thread_create(&t1, NULL, thread_rwlock_func, NULL, p);
  -    CuAssertIntEquals(tc, APR_SUCCESS, s1);
  +    CuAssertSuccess(tc, "create thread 1", s1);
       s2 = apr_thread_create(&t2, NULL, thread_rwlock_func, NULL, p);
  -    CuAssertIntEquals(tc, APR_SUCCESS, s2);
  +    CuAssertSuccess(tc, "create thread 2", s2);
       s3 = apr_thread_create(&t3, NULL, thread_rwlock_func, NULL, p);
  -    CuAssertIntEquals(tc, APR_SUCCESS, s3);
  +    CuAssertSuccess(tc, "create thread 3", s3);
       s4 = apr_thread_create(&t4, NULL, thread_rwlock_func, NULL, p);
  -    CuAssertIntEquals(tc, APR_SUCCESS, s4);
  +    CuAssertSuccess(tc, "create thread 4", s4);
   
       apr_thread_join(&s1, t1);
       apr_thread_join(&s2, t2);