--- a/localisation/apparchitecture/tef/tssaac/scripts/emulator/sysstart_apparc_run.bat	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/tef/tssaac/scripts/emulator/sysstart_apparc_run.bat	Tue Aug 03 10:20:34 2010 +0100
@@ -2,7 +2,7 @@
 @rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
-@rem under the terms of the License "Eclipse Public License v1.0"
+@rem under the terms of "Eclipse Public License v1.0"
 @rem which accompanies this distribution, and is available
 @rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 @rem
@@ -23,19 +23,20 @@
 
 :test
 	set TEST_CASE=%1
-	set TESTCASE_NUMBER=%2
-	set EPOCWIND_COPY=\epoc32\winscw\c\logs\testexecute\apparctest_%TEST_CASE%_epocwind.out
+	set TEST_BOOTMODE=%2
+	set TESTCASE_NUMBER=%3
+	set EPOCWIND_COPY=\epoc32\winscw\c\logs\testexecute\apparctest_%TEST_CASE%_epocwind_%TEST_BOOTMODE%.out
 	set EPOCWIND_ORIG=%TEMP%\epocwind.out
 
-	call z\apparctest\sysstart_apparc_setup.bat install   %TEST_CASE% %TESTCASE_NUMBER%
+	call z\apparctest\sysstart_apparc_setup.bat inst   %TEST_CASE% %TEST_BOOTMODE% %TESTCASE_NUMBER%
 
 	echo testexecute.exe z:\apparctest\apparctest_%TEST_CASE%.script
 	testexecute.exe z:\apparctest\apparctest_%TEST_CASE%.script
 
-	call z\apparctest\sysstart_apparc_setup.bat uninstall %TEST_CASE% 
+	call z\apparctest\sysstart_apparc_setup.bat uninst %TEST_CASE% %TEST_BOOTMODE%
 
 	copy %EPOCWIND_ORIG% %EPOCWIND_COPY% >NUL
-	call :updateTestSummary
+	call :updateTestSummary %TEST_BOOTMODE%
 goto :EOF
 
 :checkLog
@@ -48,33 +49,50 @@
 	type %SEARCH_FILE% | find /c %SEARCH_STRING%>%TEMP_FILE%
 	for /f "delims=\" %%i in ('type %TEMP_FILE%') do set LOG_COUNT=%%i
 	del %TEMP_FILE%
-	if "%EXPECTED_COUNT%" ==  "%LOG_COUNT%" goto :EOF
-	if "%EXPECTED_COUNT%" NEQ "%LOG_COUNT%" set TEST_RESULT_FLAG=FAIL
+	if %EXPECTED_COUNT% ==  %LOG_COUNT% goto :EOF
+	if %EXPECTED_COUNT% NEQ %LOG_COUNT% set TEST_RESULT_FLAG=FAIL
 goto :EOF
 
 :updateTestSummary
 	set TEST_RESULT_FLAG=PASS
-	call :checkLog \epoc32\winscw\c\logs\testexecute\apparctest_%TEST_CASE%.htm "%TEST_CASE% ***Result = PASS" 1
+	set TEST_BOOTMODE = %1
+	ren \epoc32\winscw\c\logs\testexecute\apparctest_%TEST_CASE%.htm apparctest_%TEST_CASE%_%TEST_BOOTMODE%.htm > NUL
+	call :checkLog \epoc32\winscw\c\logs\testexecute\apparctest_%TEST_CASE%_%TEST_BOOTMODE%.htm "%TEST_CASE% ***Result = PASS" 1
 	echo %TEST_CASE% - %TEST_RESULT_FLAG% >> %SYSSTART_APPARCTEST_SUMMARY%
 goto :EOF
 
 :skipFunctions 
     
 :: SysStart Apparc Function call tests
-call :test T_TestStartApp1L		01  
-call :test T_TestStartApp2L		02        
-call :test T_TestStartApp3L		03     
-call :test T_TestStartApp4L		04	   
-call :test T_TestStartApp5L		05     
-call :test T_TestStartApp6L		06     
-call :test T_TestGetAllApps		07     
-call :test T_TestInsertDataTypeL	08
-call :test T_TestAppForDataTypeL	09 
-call :test T_TestDeleteDataTypeL	10 
-call :test T_TestServiceDiscovery	11  
-call :test T_TestGetAppInfo     	12
-call :test T_TestAppCount	    	13
-call :test T_TestCreateDoc      	14
-call :test T_TestLocalisedCaptionL	29
+call :test T_TestStartApp1L		fb	01  
+call :test T_TestStartApp1L		ss	01  
+call :test T_TestStartApp2L		fb	02        
+call :test T_TestStartApp2L		ss	02        
+call :test T_TestStartApp3L		fb	03     
+call :test T_TestStartApp3L		ss	03     
+call :test T_TestStartApp4L		fb	04 
+call :test T_TestStartApp4L		ss	04 
+call :test T_TestStartApp5L		fb	05     
+call :test T_TestStartApp5L		ss	05     
+call :test T_TestStartApp6L		fb	06     
+call :test T_TestStartApp6L		ss	06     
+call :test T_TestGetAllApps		fb	07     
+call :test T_TestGetAllApps		ss	07     
+call :test T_TestInsertDataTypeL	fb	08
+call :test T_TestInsertDataTypeL	ss	08
+call :test T_TestAppForDataTypeL	fb	09 
+call :test T_TestAppForDataTypeL	ss	09 
+call :test T_TestDeleteDataTypeL	fb	10 
+call :test T_TestDeleteDataTypeL	ss	10 
+call :test T_TestServiceDiscovery	fb	11  
+call :test T_TestServiceDiscovery	ss	11  
+call :test T_TestGetAppInfo     	fb	12
+call :test T_TestGetAppInfo     	ss	12
+call :test T_TestAppCount	    	fb	13
+call :test T_TestAppCount	    	ss	13
+call :test T_TestCreateDoc      	fb	14
+call :test T_TestCreateDoc      	ss	14
+call :test T_TestLocalisedCaptionL	fb	29
+call :test T_TestLocalisedCaptionL	ss	29
 
 endlocal