--- a/egl/egltest/src/egltestcommonstep.cpp Fri Sep 17 08:36:49 2010 +0300
+++ b/egl/egltest/src/egltestcommonstep.cpp Mon Oct 04 02:31:51 2010 +0300
@@ -724,6 +724,7 @@
TBuf<KMaxTestExecuteNameLength> resultFilePath;
TBuf<KMaxTestExecuteNameLength> xmlFilePath;
TInt logMode;
+ TInt loggerChannel ;
TInt logLevel;
TRAPD(err,parseTestExecuteIni = CTestExecuteIniData::NewL());
@@ -736,9 +737,11 @@
parseTestExecuteIni->GetKeyValueFromIni(KTEFLogMode, logMode);
parseTestExecuteIni->GetKeyValueFromIni(KTEFLogSeverityKey, logLevel);
parseTestExecuteIni->GetKeyValueFromIni(KTEFEnableIniAccessLog, IniAccessLog());
+ parseTestExecuteIni->GetKeyValueFromIni(KTEFLogChannel, loggerChannel);
}
else
{
+ TBuf<KMaxTestExecuteNameLength> testExecuteLogPath(KTestExecuteLogPath);
resultFilePath.Copy(KTestExecuteLogPath);
xmlFilePath.Copy(KTestExecuteLogPath);
logMode = TLoggerOptions(ELogHTMLOnly);
@@ -746,6 +749,7 @@
IniAccessLog() = ETrue;
}
Logger().SetLoggerOptions(logMode);
+ Logger().SetLoggerChannel(loggerChannel) ;
// Initialise a handle to the file logger
User::LeaveIfError(Logger().Connect());
@@ -754,7 +758,7 @@
CleanupClosePushL(fS);
RFile file;
TBuf<KMaxTestExecuteNameLength> xmlLogFile(xmlFilePath);
- TBuf<KMaxTestExecuteNameLength> logFile;
+ TBuf<KMaxTestStepNameLength> logFile;
TBuf<KMaxTestExecuteNameLength> logFileNameFile(resultFilePath);
logFileNameFile.Append(KTestExecuteScheduleTestLogCompatibilityNameFile);
if(file.Open(fS,logFileNameFile,EFileRead | EFileShareAny) != KErrNone)
@@ -789,7 +793,19 @@
if (logMode == 0 || logMode == 2)
{
- User::LeaveIfError(Logger().HtmlLogger().CreateLog(logFilePath,RTestExecuteLogServ::ELogModeAppend));
+ TRAPD(err1,Logger().HtmlLogger().CreateLog(logFilePath,RTestExecuteLogServ::ELogModeAppend));
+ if(err1 != KErrPathNotFound)
+ {
+ User::LeaveIfError(err1) ;
+ }
+ else
+ {
+ _LIT(KHtmExtension,".htm");
+ if(logFilePath.Find(KHtmExtension)>-1)
+ {
+ User::LeaveIfError(err1) ;
+ }
+ }
Logger().HtmlLogger().SetLogLevel(TLogSeverity(logLevel));
}
if (logMode == 1 || logMode == 2)