--- a/common/tools/ats/bctest/BC_PLAT.h	Tue Jul 07 10:37:07 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#define __SERIES60_30__
-#define __SERIES60_31__
-#define __S60_32__
-#define __S60_50__

--- a/common/tools/ats/bctest/bctest.pl	Tue Jul 07 10:37:07 2009 +0100
+++ b/common/tools/ats/bctest/bctest.pl	Tue Jul 14 09:28:38 2009 +0100
@@ -78,6 +78,8 @@
 
 copy($epoc . "data/z/resource/apps/bctestlist_aif.mbm",							"temp/bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm");
 copy($epoc . "data/z/resource/apps/bctestlist.rsc",								"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.rsc");
+copy($epoc . "release/winscw/udeb/z/resource/apps/bctestlist.mbm",				"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.mbm");
+copy($epoc . "release/winscw/udeb/z/resource/apps/bctestlist.mif",				"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.mif");
 copy($epoc . "data/z/private/10003a3f/apps/bctestlist_reg.rsc",					"temp/bctest/winscw_udeb/z/private/10003a3f/apps/bctestlist_reg.rsc");
 
 copy($epoc . "data/z/resource/apps/bctestmenu.rsc",								"temp/bctest/winscw_udeb/z/resource/apps/bctestmenu.rsc");

--- a/common/tools/ats/bctest/bctest.xml	Tue Jul 07 10:37:07 2009 +0100
+++ b/common/tools/ats/bctest/bctest.xml	Tue Jul 14 09:28:38 2009 +0100
@@ -31,8 +31,8 @@
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="release_note.txt"/>
-							<param dst="c:\BCTestLog\release_note.txt"/>
+							<param src="config.xml"/>
+							<param dst="c:\BCTestLog\config.xml"/>
 							<param component-path="bctest\BCTestLog" />
 						</params>
 					</step>
@@ -40,8 +40,8 @@
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="config.xml"/>
-							<param dst="c:\BCTestLog\config.xml"/>
+							<param src="release_note.txt"/>
+							<param dst="c:\BCTestLog\release_note.txt"/>
 							<param component-path="bctest\BCTestLog" />
 						</params>
 					</step>
@@ -616,6 +616,24 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestlist.mbm"/>
+							<param dst="z:\resource\apps\bctestlist.mbm"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestlist.mif"/>
+							<param dst="z:\resource\apps\bctestlist.mif"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="bctestlist.exe"/>
 							<param dst="c:\sys\bin\bctestlist.exe"/>
 							<param component-path="bctest" />
@@ -1684,16 +1702,6 @@
 						<command>execute</command>
 						<params>
 							<param file="bctestlauncher.exe"/>
-							<param parameters="bctestkeylock"/>
-							<param result-file="c:\BCTestLog\bctestkeylock_TestLog.txt"/>
-							<param parser="BCTestResultParser"/>
-							<param timeout="1000"/>
-						</params>
-					</step>
-					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="bctestlauncher.exe"/>
 							<param parameters="bctestlabelinfoindicators"/>
 							<param result-file="c:\BCTestLog\bctestlabelinfoindicators_TestLog.txt"/>
 							<param parser="BCTestResultParser"/>
@@ -2010,6 +2018,16 @@
 							<param timeout="1000"/>
 						</params>
 					</step>
+					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="bctestlauncher.exe"/>
+							<param parameters="bctestkeylock"/>
+							<param result-file="c:\BCTestLog\bctestkeylock_TestLog.txt"/>
+							<param parser="BCTestResultParser"/>
+							<param timeout="1000"/>
+						</params>
+					</step>
 				</case>
 			</set>
 		</session>
@@ -2081,6 +2099,8 @@
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlist_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.mif</file>
 		<file>bctest/winscw_udeb/bctestlist.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmenu_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestmenu.rsc</file>

--- a/common/tools/ats/bctest/bctestprebuild.pl	Tue Jul 07 10:37:07 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use File::Copy;
-use File::Path;
-
-my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("BC_PLAT.h",	$epoc . "include");