Changeset 2513

Timestamp:

26/04/2009 19:41:41 (3 years ago)

Author:

chris

Message:

Fix httpserver tests on win32.

File:

• box/trunk/test/httpserver/testhttpserver.cpp (modified) (4 diffs)

box/trunk/test/httpserver/testhttpserver.cpp

@@ -239 +239 @@
         // Kill it
         TEST_THAT(KillServer(pid));
-        TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
+
+        #ifdef WIN32
+                TEST_THAT(unlink("testfiles/httpserver.pid") == 0);
+        #else
+                TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
+        #endif
 
         // correct, official signature should succeed, with lower-case header
@@ -388 +393 @@
         }
 
+        #ifndef WIN32 // much harder to make files inaccessible on WIN32
         // Make file inaccessible, should cause server to return a 403 error,
         // unless of course the test is run as root :)
@@ -406 +412 @@
                 TEST_THAT(chmod("testfiles/testrequests.pl", 0755) == 0);
         }
+        #endif
 
         {
@@ -462 +469 @@
         // Kill it
         TEST_THAT(KillServer(pid));
-        TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
+
+        #ifdef WIN32
+                TEST_THAT(unlink("testfiles/s3simulator.pid") == 0);
+        #else
+                TestRemoteProcessMemLeaks("generic-httpserver.memleaks");
+        #endif
 
         return 0;