--- a/testfws/stif/Logger/src/StifLogger.cpp Fri Sep 17 08:39:50 2010 +0300
+++ b/testfws/stif/Logger/src/StifLogger.cpp Mon Oct 04 02:58:21 2010 +0300
@@ -485,12 +485,30 @@
( aLoggerSettings.iHardwarePath.Length() -1 ), 1 );
}
}
- // Removes drive letter if given and appends implemented path
- TParse parse;
- parse.Set( aTestPath, NULL, NULL );
- // Path() return value starts with '\'
- newPath.Append( parse.Path() );
- aTestPath = newPath;
+ ret = aTestPath.LocateReverse(92);
+ // Is '\' character founded
+
+ if (ret != KErrNotFound)
+ {
+ // Is '\' last character
+ if (ret == (aTestPath.Length() - 1))
+ {
+ // delete last '\'
+ aTestPath.Delete((aTestPath.Length()- 1), 1);
+ }
+ }
+ ret = aTestPath.LocateReverse('\\');
+
+ //cut logger specyfic directory (like: \\Demomodule)
+
+ aTestPath = aTestPath.Right(aTestPath.Length()-ret);
+
+ // patch must end with '\'
+ aTestPath.Append('\\');
+
+ // create path by combining path form .ini file with test module name
+ newPath.Append(aTestPath);
+ aTestPath = newPath;
}
if( aLoggerSettings.iIsDefined.iHwFormat )
{
@@ -529,11 +547,28 @@
( aLoggerSettings.iEmulatorPath.Length() -1 ), 1 );
}
}
- // Removes drive letter if given and appends implemented path
- TParse parse;
- parse.Set( aTestPath, NULL, NULL );
- // Path() return value starts with '\'
- newPath.Append( parse.Path() );
+
+ ret = aTestPath.LocateReverse(92);
+ // Is '\' character founded
+
+ if (ret != KErrNotFound)
+ {
+ // Is '\' last character
+ if (ret == (aTestPath.Length() - 1))
+ {
+ // delete last '\'
+ aTestPath.Delete((aTestPath.Length()- 1), 1);
+ }
+ }
+ ret = aTestPath.LocateReverse('\\');
+
+ //cut logger specyfic directory (like: \\Demomodule)
+ aTestPath = aTestPath.Right(aTestPath.Length()-ret);
+ // patch must end with '\'
+ aTestPath.Append('\\');
+
+ // create path by combining path form .ini file with test module name
+ newPath.Append(aTestPath);
aTestPath = newPath;
}
if( aLoggerSettings.iIsDefined.iFormat )