apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/test Makefile.in testdir.c testoc.c testproc.c
Date Thu, 02 Aug 2001 21:07:05 GMT
trawick     01/08/02 14:07:05

  Modified:    test     Makefile.in testdir.c testoc.c testproc.c
  Log:
  use exit status 0 for success in testdir, testoc, and testproc
  
  since testoc depends on occhild, build occhild when testoc is built
  
  add some trivial error code display logic to testoc
  
  Revision  Changes    Path
  1.64      +1 -1      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Makefile.in	2001/08/02 20:35:12	1.63
  +++ Makefile.in	2001/08/02 21:07:04	1.64
  @@ -60,7 +60,7 @@
   testdso@EXEEXT@: testdso.lo mod_test.so $(LOCAL_LIBS)
   	$(LINK) -export-dynamic testdso.lo $(LOCAL_LIBS) $(ALL_LIBS)
   
  -testoc@EXEEXT@: testoc.lo $(LOCAL_LIBS)
  +testoc@EXEEXT@: testoc.lo occhild@EXEEXT@ $(LOCAL_LIBS)
   	$(LINK) testoc.lo $(LOCAL_LIBS) $(ALL_LIBS)
   
   occhild@EXEEXT@: occhild.lo $(LOCAL_LIBS)
  
  
  
  1.3       +1 -1      apr/test/testdir.c
  
  Index: testdir.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testdir.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testdir.c	2001/06/28 14:05:20	1.2
  +++ testdir.c	2001/08/02 21:07:04	1.3
  @@ -129,5 +129,5 @@
       apr_pool_destroy(pool);
   
       printf("\nAll tests passed OK\n");
  -    return 1;
  +    return 0;
   }
  
  
  
  1.22      +7 -3      apr/test/testoc.c
  
  Index: testoc.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testoc.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- testoc.c	2001/06/06 19:56:56	1.21
  +++ testoc.c	2001/08/02 21:07:04	1.22
  @@ -92,6 +92,7 @@
   int main(int argc, char *argv[])
   {
   #if APR_HAS_OTHER_CHILD
  +    apr_status_t rv;
       apr_pool_t *context;
       apr_proc_t newproc;
       apr_procattr_t *procattr = NULL;
  @@ -143,8 +144,11 @@
       fprintf(stdout, "[PARENT] Sending SIGKILL to child......");
       fflush(stdout);
       apr_sleep(1 * APR_USEC_PER_SEC);
  -    if (apr_proc_kill(&newproc, SIGKILL) != APR_SUCCESS) {
  -        fprintf(stderr,"couldn't send the signal!\n");
  +    if ((rv = apr_proc_kill(&newproc, SIGKILL)) != APR_SUCCESS) {
  +        char msgbuf[120];
  +
  +        fprintf(stderr,"couldn't send the signal: %d/%s!\n",
  +                rv, apr_strerror(rv, msgbuf, sizeof msgbuf));
           exit(-1);
       }
       fprintf(stdout,"OK\n");
  @@ -159,6 +163,6 @@
       fprintf(stdout, "Other_child is not supported on this platform\n");
   #endif
   
  -    return 1;
  +    return 0;
   }    
   
  
  
  
  1.30      +1 -1      apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testproc.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- testproc.c	2001/06/08 04:49:49	1.29
  +++ testproc.c	2001/08/02 21:07:04	1.30
  @@ -146,6 +146,6 @@
       STD_TEST_NEQ("Removing directory", apr_dir_remove("proctest", pool))
   
       printf("\nTest completed succesfully\n");
  -    return(1);
  +    return 0;
   }
   
  
  
  

Mime
View raw message