Changeset 163 for trunk/MFCtooling

Timestamp:

08/15/11 15:34:28 (13 years ago)

Author:

sherbold

Message:

• optional parameter -p now sets the working directory of the application under test

Location:

trunk/MFCtooling/replay

Files:

• LogParser.cpp (modified) (3 diffs)
• LogParser.h (modified) (2 diffs)
• replay.cpp (modified) (2 diffs)

trunk/MFCtooling/replay/LogParser.cpp

@@ -8 +8 @@
 LogParser::LogParser(_TCHAR* runCommand, unsigned int startupTime, TestResults * results, bool useDefaultDelay) : runCommand(runCommand), startupTime(startupTime), results(results), useDefaultDelay(useDefaultDelay)
 {
-        
+        workingPath = NULL;
 }
 
@@ -42 +42 @@
                 ZeroMemory(&si, sizeof(si));
 
-                //divide runCommand into path to executable and parameters
-                /*wchar_t *pdest = _tcschr(runCommand, ' ');
-                int positionSpace = (int)(pdest - runCommand + 1);
-                _TCHAR *executable = new _TCHAR[512];
-                for(int i=0; i<positionSpace; i++) executable[i] = runCommand[i];
-                executable[positionSpace] = '\0';*/
-
-                //CreateProcess(executable, L" c:\\programme\\mahr\\marwin\\commands/pause.dll", NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
-                CreateProcess(NULL, runCommand, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+                CreateProcess(NULL, runCommand, NULL, NULL, FALSE, 0, NULL, workingPath, &si, &pi);
+
                 hProcess = pi.hProcess;
                 CloseHandle(pi.hThread);
@@ -257 +250 @@
         }
 }
+
+void LogParser::setWorkingPath(TCHAR * workingPath) {
+        this->workingPath = workingPath;
+}

trunk/MFCtooling/replay/LogParser.h

@@ -24 +24 @@
 
         _TCHAR * runCommand;
+        _TCHAR * workingPath;
         unsigned int startupTime;
         HANDLE hProcess;
@@ -63 +64 @@
 
         int getDefaultMsgDelay();
+
+        void setWorkingPath(TCHAR * workingPath);
 };

trunk/MFCtooling/replay/replay.cpp

@@ -50 +50 @@
 int _tmain(int argc, _TCHAR* argv[])
 {
+        if( argc < 3 ) {
+                return -1;
+        }
+
         int optchar;
         const char * optarg;
-
         // set default values
         TCHAR * resultfile = NULL;
@@ -122 +125 @@
                 std::wcout << L"replaying sessions in " << argv[1] << std::endl;
                 LogParser * parser = new LogParser(appUnderTest, startdelay, &results, (bool) msgdelay);
+                parser->setWorkingPath(workingPath);
                 pXMLReader->putContentHandler(parser);
                 hr = pXMLReader->parseURL(replayfile);