cvs commit: apr/test Makefile.win testflock.c

[rbb]

rbb         2004/03/13 04:38:16

  Modified:    test     Makefile.win testflock.c
  Log:
  Add testflock to windows build, cleanup after the test.
  
  Revision  Changes    Path
  1.14      +4 -4      apr/test/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.win,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Makefile.win      13 Mar 2004 00:29:31 -0000      1.13
  +++ Makefile.win      13 Mar 2004 12:38:16 -0000      1.14
  @@ -10,8 +10,8 @@
        sendfile.exe \
        server.exe \
        proc_child.exe \
  +        tryread.exe \
        occhild.exe\
  -     testflock.exe \
        testsock.exe \
        testlockperf.exe \
        testshmproducer.exe \
  @@ -39,8 +39,8 @@
   .c.obj:
        cl /nologo /c /MDd /W3 /GX /Zi /Od /DWIN32 /D_DEBUG /D_WINDOWS 
/DAPR_DECLARE_STATIC $(INCLUDES) $<
   
  -testflock.exe: testflock.obj $(LOCAL_LIBS)
  -     $(LINK) testflock.obj $(LOCAL_LIBS) $(ALL_LIBS)
  +tryread.exe: tryread.obj $(LOCAL_LIBS)
  +     $(LINK) tryread.obj $(LOCAL_LIBS) $(ALL_LIBS)
   
   occhild.exe: occhild.obj $(LOCAL_LIBS)
        $(LINK) occhild.obj $(LOCAL_LIBS) $(ALL_LIBS)
  @@ -96,7 +96,7 @@
        testpoll.obj testlock.obj testsockopt.obj testpipe.obj testthread.obj \
        testhash.obj testargs.obj testnames.obj testuser.obj testpath.obj \
        testenv.obj testprocmutex.obj testrand2.obj testfnmatch.obj \
  -        testatomic.obj
  +        testatomic.obj testflock.obj
   
   testall.exe: $(TESTS) CuTest.obj $(LOCAL_LIBS)
        $(LINK) /debug /subsystem:console /machine:I386 $(TESTS) CuTest.obj \
  
  
  
  1.15      +7 -0      apr/test/testflock.c
  
  Index: testflock.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testflock.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- testflock.c       13 Mar 2004 12:34:49 -0000      1.14
  +++ testflock.c       13 Mar 2004 12:38:16 -0000      1.15
  @@ -95,12 +95,19 @@
       CuAssertIntEquals(tc, SUCCESSFUL_READ, code);
   }
   
  +static void remove_lockfile(CuTest *tc)
  +{
  +    apr_assert_success(tc, "Couldn't remove lock file.",
  +                       apr_file_remove(TESTFILE, p));
  +}
  +    
   CuSuite *testflock(void)
   {
       CuSuite *suite = CuSuiteNew("Flock");
   
       SUITE_ADD_TEST(suite, test_withlock);
       SUITE_ADD_TEST(suite, test_withoutlock);
  +    SUITE_ADD_TEST(suite, remove_lockfile);
   
       return suite;
   }