cvs commit: apr/test testtemp.c Makefile.in Makefile.win test_apr.h testall.c

[rb...@apache.org]

rbb         2004/03/18 09:46:02

  Modified:    test     Makefile.in Makefile.win test_apr.h testall.c
  Added:       test     testtemp.c
  Log:
  Add a simple test for the functions that deal with temp files and
  directories.  This needs a lot more work.
  
  Revision  Changes    Path
  1.156     +1 -1      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- Makefile.in	18 Mar 2004 03:30:58 -0000	1.155
  +++ Makefile.in	18 Mar 2004 17:46:02 -0000	1.156
  @@ -102,7 +102,7 @@
   	testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \
   	testenv.lo testprocmutex.lo testrand2.lo testfnmatch.lo \
           testatomic.lo testflock.lo testshm.lo testsock.lo testglobalmutex.lo \
  -        teststrnatcmp.lo testfilecopy.lo
  +        teststrnatcmp.lo testfilecopy.lo testtemp.lo
   
   testall: $(TESTS) mod_test.la libmod_test.la occhild@EXEEXT@ \
   	 readchild@EXEEXT@ CuTest.lo proc_child@EXEEXT@ \
  
  
  
  1.20      +2 -1      apr/test/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.win,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Makefile.win	18 Mar 2004 03:30:58 -0000	1.19
  +++ Makefile.win	18 Mar 2004 17:46:02 -0000	1.20
  @@ -86,7 +86,8 @@
   	testhash.obj testargs.obj testnames.obj testuser.obj testpath.obj \
   	testenv.obj testprocmutex.obj testrand2.obj testfnmatch.obj \
           testatomic.obj testflock.obj testshm.obj testsock.obj \
  -        testglobalmutex.obj teststrnatcmp.obj testfilecopy.obj
  +        testglobalmutex.obj teststrnatcmp.obj testfilecopy.obj \
  +        testtemp.obj
   
   testall.exe: $(TESTS) CuTest.obj $(LOCAL_LIBS)
   	$(LINK) /debug /subsystem:console /machine:I386 $(TESTS) CuTest.obj \
  
  
  
  1.55      +1 -0      apr/test/test_apr.h
  
  Index: test_apr.h
  ===================================================================
  RCS file: /home/cvs/apr/test/test_apr.h,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- test_apr.h	18 Mar 2004 03:30:58 -0000	1.54
  +++ test_apr.h	18 Mar 2004 17:46:02 -0000	1.55
  @@ -71,6 +71,7 @@
   CuSuite *teststr(void);
   CuSuite *teststrnatcmp(void);
   CuSuite *testtable(void);
  +CuSuite *testtemp(void);
   CuSuite *testthread(void);
   CuSuite *testtime(void);
   CuSuite *testud(void);
  
  
  
  1.59      +1 -0      apr/test/testall.c
  
  Index: testall.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testall.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- testall.c	18 Mar 2004 03:30:58 -0000	1.58
  +++ testall.c	18 Mar 2004 17:46:02 -0000	1.59
  @@ -74,6 +74,7 @@
       {"teststr", teststr},
       {"teststrnatcmp", teststrnatcmp},
       {"testtable", testtable},
  +    {"testtemp", testtemp},
       {"testthread", testthread},
       {"testtime", testtime},
       {"testud", testud},
  
  
  
  1.1                  apr/test/testtemp.c
  
  Index: testtemp.c
  ===================================================================
  /* Copyright 2000-2004 The Apache Software Foundation
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  #include "test_apr.h"
  #include "apr_file_io.h"
  
  static void test_temp_dir(CuTest *tc)
  {
      const char *tempdir = NULL;
      apr_status_t rv;
  
      rv = apr_temp_dir_get(&tempdir, p);
      apr_assert_success(tc, "Error finding Temporary Directory", rv);
      CuAssertPtrNotNull(tc, tempdir);
  }
  
  CuSuite *testtemp(void)
  {
      CuSuite *suite = CuSuiteNew("Temp Dir");
  
      SUITE_ADD_TEST(suite, test_temp_dir);
  
      return suite;
  }