# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401845 -7200 # Node ID ecff51f1e7fbf842c0bb8e46137f9522f22a3475 # Parent 73ff0d268e1dced57bc3a055a0205618403b1e1a Revision: 201007 Kit: 201008 diff -r 73ff0d268e1d -r ecff51f1e7fb stif/Logger/src/FileOutput.cpp --- a/stif/Logger/src/FileOutput.cpp Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/Logger/src/FileOutput.cpp Fri Mar 12 15:50:45 2010 +0200 @@ -479,7 +479,10 @@ TBool isOpen( EFalse ); TInt ret( KErrNone ); - iIsFileOpen = iFileSession.IsFileOpen( iFileAndDirName, isOpen ); + + iIsFileOpen=iFile.Open( iFileSession, iFileAndDirName, + EFileWrite | EFileStreamText | + EFileShareAny ); if( iIsFileOpen == KErrNotFound ) { ret = iFile.Create( iFileSession, iFileAndDirName, @@ -498,9 +501,8 @@ } else if( iIsFileOpen == KErrNone ) { - ret = iFile.Open( iFileSession, iFileAndDirName, - EFileWrite | EFileStreamText | - EFileShareAny ); + + ret=KErrNone; } // Probably path not found else diff -r 73ff0d268e1d -r ecff51f1e7fb stif/TestCombiner/inc/StifPythonFunComb.h --- a/stif/TestCombiner/inc/StifPythonFunComb.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/TestCombiner/inc/StifPythonFunComb.h Fri Mar 12 15:50:45 2010 +0200 @@ -21,7 +21,7 @@ #define STIFPYTHONFUNCOMB_H // INCLUDES -#include +#include // CONSTANTS // None diff -r 73ff0d268e1d -r ecff51f1e7fb stif/TestCombiner/inc/TestCase.h --- a/stif/TestCombiner/inc/TestCase.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/TestCombiner/inc/TestCase.h Fri Mar 12 15:50:45 2010 +0200 @@ -20,7 +20,7 @@ #define TESTCASE_H // INCLUDES -#include +#include #include #include #include "TestCaseNotify.h" diff -r 73ff0d268e1d -r ecff51f1e7fb stif/TestCombiner/src/TestCombiner.cpp --- a/stif/TestCombiner/src/TestCombiner.cpp Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/TestCombiner/src/TestCombiner.cpp Fri Mar 12 15:50:45 2010 +0200 @@ -1833,6 +1833,12 @@ // Checking if user wants to skip the rest of the execution in case of error @js if(iCancelIfError && iSchedulerActive) { + // Cancel event if it was waiting event + if(iTestRunner->iEvent.Name() != KNullDesC && iTestRunner->iEvent.Type() == TEventIf::EWaitEvent) + { + TestModuleIf().CancelEvent(iTestRunner->iEvent, &iTestRunner->iStatus); + } + // Interpret execution result type from returned result TInt executionResult = TFullTestResult::ECaseExecuted; // Ok if( (aTestCase->iResult.iCaseExecutionResultType >= diff -r 73ff0d268e1d -r ecff51f1e7fb stif/TestEngine/inc/StifPythonFunEng.h --- a/stif/TestEngine/inc/StifPythonFunEng.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/TestEngine/inc/StifPythonFunEng.h Fri Mar 12 15:50:45 2010 +0200 @@ -21,7 +21,7 @@ #define STIFPYTHONFUNENG_H // INCLUDES -#include +#include // CONSTANTS // None diff -r 73ff0d268e1d -r ecff51f1e7fb stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXX.cpp --- a/stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXX.cpp Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXX.cpp Fri Mar 12 15:50:45 2010 +0200 @@ -33,6 +33,8 @@ //#define STIFUNIT_OOMTESTINITIALIZEL //#define STIFUNIT_OOMHANDLEWARNINGL //#define STIFUNIT_OOMTESTFINALIZEL +// Uncomment following define, if you want to increase heap or stack size. +// #define STIFUNIT_SETHEAPANDSTACKSIZE /******************************************************************************/ @@ -57,6 +59,28 @@ #include /* + * Implementation of setHeapAndStack virtual methods. + * To changes heap and stack size provide new values to iTestThreadStackSize, iTestThreadMinHeap and iTestThreadMaxHeap. +*/ + +#ifdef STIFUNIT_SETHEAPANDSTACKSIZE +EXPORT_C TInt SetRequirements( CTestModuleParam*& aTestModuleParam, + TUint32& aParameterValid ) + { + aParameterValid = KStifTestModuleParameterChanged; + CTestModuleParamVer01* param = CTestModuleParamVer01::NewL(); + // Stack size + param->iTestThreadStackSize= 16384; // 16K stack + // Heap sizes + param->iTestThreadMinHeap = 4096; // 4K heap min + param->iTestThreadMaxHeap = 1048576;// 1M heap max + + return KErrNone; + } +#undef STIFUNIT_SETHEAPANDSTACKSIZE +#endif + +/* * User implementation of OOM virtual methods. * Providing own implementation requires uncommenting defines at the * beginnig of this file. diff -r 73ff0d268e1d -r ecff51f1e7fb stif/TestModuleTemplates/TestModuleTemplates.zip Binary file stif/TestModuleTemplates/TestModuleTemplates.zip has changed diff -r 73ff0d268e1d -r ecff51f1e7fb stif/TouchConsoleUI/src/ConsoleUI.cpp --- a/stif/TouchConsoleUI/src/ConsoleUI.cpp Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/TouchConsoleUI/src/ConsoleUI.cpp Fri Mar 12 15:50:45 2010 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include diff -r 73ff0d268e1d -r ecff51f1e7fb stif/group/ReleaseNote.txt --- a/stif/group/ReleaseNote.txt Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/group/ReleaseNote.txt Fri Mar 12 15:50:45 2010 +0200 @@ -1,5 +1,5 @@ ======================================================================== -RELEASE NOTE FOR STIF - STIF_201003 (7.3.25) +RELEASE NOTE FOR STIF - STIF_201006 (7.3.26) SUPPORTING SERIES 60 3.0 -> ======================================================================== diff -r 73ff0d268e1d -r ecff51f1e7fb stif/inc/STIFMeasurement.h --- a/stif/inc/STIFMeasurement.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/inc/STIFMeasurement.h Fri Mar 12 15:50:45 2010 +0200 @@ -19,7 +19,7 @@ #define STIF_MEASUREMENT_H // INCLUDES -#include +#include // Maximum length of measurement types(see literals below) const TInt KStifMeasurementTypeLength = 30; diff -r 73ff0d268e1d -r ecff51f1e7fb stif/inc/StifPython.h --- a/stif/inc/StifPython.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/inc/StifPython.h Fri Mar 12 15:50:45 2010 +0200 @@ -21,7 +21,7 @@ #define STIFPYTHON_H // INCLUDES -#include +#include // CONSTANTS _LIT(KPythonScripter, "pythonscripter"); diff -r 73ff0d268e1d -r ecff51f1e7fb stif/inc/version.h --- a/stif/inc/version.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/inc/version.h Fri Mar 12 15:50:45 2010 +0200 @@ -20,9 +20,9 @@ #define STIF_MAJOR_VERSION 7 #define STIF_MINOR_VERSION 3 -#define STIF_BUILD_VERSION 25 +#define STIF_BUILD_VERSION 26 -#define STIF_REL_DATE "19th Jan 2010" +#define STIF_REL_DATE "09th Feb 2010" #define TO_UNICODE(text) _L(text) diff -r 73ff0d268e1d -r ecff51f1e7fb stif/sis/Stif_31.sis Binary file stif/sis/Stif_31.sis has changed diff -r 73ff0d268e1d -r ecff51f1e7fb stif/stif_plat/inc/StifCommand.h --- a/stif/stif_plat/inc/StifCommand.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/stif_plat/inc/StifCommand.h Fri Mar 12 15:50:45 2010 +0200 @@ -21,7 +21,7 @@ // INCLUDES -#include +#include // CONSTANTS const TInt KMaxCommandParamsLength = 50; // DEPRECATED use KMaxCommandParamsLength2 instead diff -r 73ff0d268e1d -r ecff51f1e7fb stif/stif_plat/inc/StifUnitGeneric.h --- a/stif/stif_plat/inc/StifUnitGeneric.h Sat Feb 20 00:22:34 2010 +0200 +++ b/stif/stif_plat/inc/StifUnitGeneric.h Fri Mar 12 15:50:45 2010 +0200 @@ -461,13 +461,14 @@ { return STIF_UNIT_MODULE_CLASS_NAME::NewL(); } - +#ifndef STIFUNIT_SETHEAPANDSTACKSIZE EXPORT_C TInt SetRequirements( CTestModuleParam*& /*aTestModuleParam*/, TUint32& /*aParameterValid*/ ) { return KErrNone; } +#endif #endif // StifUnitGeneric_H // End of File