--- 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 >=