Changeset 927 for box/chris/merge/lib/common/Test.h

Timestamp:

02/09/2006 11:44:29 (6 years ago)

Author:

chris

Message:

(refs #3)

Convert UNIX paths to native on Win32 (avoids #ifdefs in tests)

File:

• box/chris/merge/lib/common/Test.h (modified) (3 diffs)

box/chris/merge/lib/common/Test.h

@@ -80 +80 @@
 }
 
-inline int LaunchServer(const char *CommandLine, const char *pidFile)
-{
-        if(::system(CommandLine) != 0)
-        {
-                printf("Server: %s\n", CommandLine);
+inline int LaunchServer(const char *pCommandLine, const char *pidFile)
+{
+#ifdef WIN32
+        // convert UNIX paths to native
+
+        std::string command;
+        for (int i = 0; pCommandLine[i] != 0; i++)
+        {
+                if (pCommandLine[i] == '/')
+                {
+                        command += '\\';
+                }
+                else
+                {
+                        command += pCommandLine[i];
+                }
+        }
+
+#else // !WIN32
+        std::string command = pCommandLine;
+#endif
+
+        if(::system(command.c_str()) != 0)
+        {
+                printf("Server: %s\n", command.c_str());
                 TEST_FAIL_WITH_MESSAGE("Couldn't start server");
                 return -1;
@@ -94 +114 @@
         if(!TestFileExists(pidFile))
         {
-                printf("Server: %s\n", CommandLine);
+                printf("Server: %s\n", command.c_str());
                 TEST_FAIL_WITH_MESSAGE("Server didn't save PID file");  
                 return -1;
@@ -103 +123 @@
         if(f == NULL || fscanf(f, "%d", &pid) != 1)
         {
-                printf("Server: %s (pidfile %s)\n", CommandLine, pidFile);
+                printf("Server: %s (pidfile %s)\n", command.c_str(), pidFile);
                 TEST_FAIL_WITH_MESSAGE("Couldn't read PID file");       
                 return -1;