# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1254399724 -3600
# Node ID f0c8c9e2cbbd14c691923a66d7fbba68734dd942
# Parent  8018a074606b2c0d0d2a46822395df8143e60609# Parent  cd084e6d144e06a6bb7f684dfcbe70ecd41cd13a
merge and switch off static bc check

diff -r cd084e6d144e -r f0c8c9e2cbbd common/common_props.ant.xml
--- a/common/common_props.ant.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/common_props.ant.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -97,8 +97,8 @@
 
     <!-- BC check properties -->
     <property name="sf.spec.bccheck.enable" value="false"/> <!-- This disables it being called during a normal build, although the target can be called seperately -->
-    <property name="sf.spec.bccheck.enable.la" value="true"/>
-    <property name="sf.spec.bccheck.enable.ha" value="true"/>
+    <property name="sf.spec.bccheck.enable.la" value="false"/>
+    <property name="sf.spec.bccheck.enable.ha" value="false"/>
     <property name="sf.spec.bccheck.enable.dynamic" value="true"/>
     <property name="sf.spec.bccheck.baseline.name" value="symbian1"/>
     <property name="sf.spec.bccheck.baseline.skd.dir" value="\\v800008\builds01\releases\installed\s60_5th_sdk_installed"/>
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/appsupport/profilesengine/profilesengine.pl
--- a/common/tools/ats/bctest/appsupport/profilesengine/profilesengine.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/appsupport/profilesengine/profilesengine.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -20,15 +20,15 @@
 use File::Path;
 
 unlink "profilesengine.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/bcprofilesengine/general/testframework";
 mkpath "temp/bcprofilesengine/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("profilesengine.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/proengwrapapi.dll",                   "temp/bcprofilesengine/winscw_udeb/proengwrapapi.dll");
-copy($epoc . "winscw/c/testframework/testframework_proengwrapapi.ini",  "temp/bcprofilesengine/general/testframework/testframework_proengwrapapi.ini");
-copy($epoc . "winscw/c/testframework/proengwrapapi.cfg",                "temp/bcprofilesengine/general/testframework/proengwrapapi.cfg");
+copy($epoc . "release/winscw/udeb/proengwrapapi.dll",                   "temp/bcprofilesengine/winscw_udeb/proengwrapapi.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_proengwrapapi.ini",  "temp/bcprofilesengine/general/testframework/testframework_proengwrapapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/proengwrapapi.cfg",                "temp/bcprofilesengine/general/testframework/proengwrapapi.cfg") or die "failed : $!";
 
 system("7z a -tzip profilesengine.zip ./temp/*");
\ No newline at end of file
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/appsupport/profilesengine/profilesengine.xml
--- a/common/tools/ats/bctest/appsupport/profilesengine/profilesengine.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/appsupport/profilesengine/profilesengine.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="" name="Profiles Engine BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/base/test.xml
--- a/common/tools/ats/bctest/base/test.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/base/test.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -9,7 +9,6 @@
 	<target>
 		<device alias="emulator_udeb" rank="master">
 			<property name="harness" value="GENERIC" />
-			<property name="name" value="emulator_udeb" />
 		</device>
 	</target>
 	<plan id="" name="Base SVS Plan" harness="GENERIC" enabled="true" passrate="100">
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/browser/browser.pl
--- a/common/tools/ats/bctest/browser/browser.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/browser/browser.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -27,9 +27,9 @@
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("browser.xml", "temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/favouritesbctest.dll",		"temp/bcbrowser/winscw_udeb/favouritesbctest.dll");
-copy($epoc . "release/winscw/udeb/downloadmgrbctest.dll",		"temp/bcbrowser/winscw_udeb/downloadmgrbctest.dll");
+copy($epoc . "release/winscw/udeb/favouritesbctest.dll",		"temp/bcbrowser/winscw_udeb/favouritesbctest.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/downloadmgrbctest.dll",		"temp/bcbrowser/winscw_udeb/downloadmgrbctest.dll") or die "failed : $!";
 
-copy($epoc . "winscw/c/testframework/testframework_dwmgr.ini",	"temp/bcbrowser/general/testframework/testframework_dwmgr.ini");
+copy($epoc . "winscw/c/testframework/testframework_dwmgr.ini",	"temp/bcbrowser/general/testframework/testframework_dwmgr.ini") or die "failed : $!";
 
 system("7z a -tzip browser.zip ./temp/*");
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/contacts/phonebook/phonebook.xml
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="" name="Contacts Phonebook BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/drm/drm.pl
--- a/common/tools/ats/bctest/drm/drm.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/drm/drm.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -20,21 +20,21 @@
 use File::Path;
 
 unlink "drmtest.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/drmtest/general/testframework";
 mkpath "temp/drmtest/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("drm.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/drm_caf.dll",					"temp/drmtest/winscw_udeb/drm_caf.dll");
-copy($epoc . "release/winscw/udeb/bcdrmcafcaps.exe",			"temp/drmtest/winscw_udeb/bcdrmcafcaps.exe");
-copy($epoc . "winscw/c/testframework/testframework_drmcaf.ini",	"temp/drmtest/general/testframework/testframework_drmcaf.ini");
-copy($epoc . "winscw/c/testframework/drm_caf.cfg",				"temp/drmtest/general/testframework/drm_caf.cfg");
-copy($epoc . "winscw/c/content-noenc-trunc.odf",				"temp/drmtest/general/content-noenc-trunc.odf");
-copy($epoc . "winscw/c/content.odf",							"temp/drmtest/general/content.odf");
-copy($epoc . "winscw/c/content.txt",							"temp/drmtest/general/content.txt");
-copy($epoc . "winscw/c/content-noenc.odf",						"temp/drmtest/general/content-noenc.odf");
-copy($epoc . "winscw/c/content.dcf",							"temp/drmtest/general/content.dcf");
+copy($epoc . "release/winscw/udeb/drm_caf.dll",					"temp/drmtest/winscw_udeb/drm_caf.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/bcdrmcafcaps.exe",			"temp/drmtest/winscw_udeb/bcdrmcafcaps.exe") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_drmcaf.ini",	"temp/drmtest/general/testframework/testframework_drmcaf.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/drm_caf.cfg",				"temp/drmtest/general/testframework/drm_caf.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/content-noenc-trunc.odf",				"temp/drmtest/general/content-noenc-trunc.odf") or die "failed : $!";
+copy($epoc . "winscw/c/content.odf",							"temp/drmtest/general/content.odf") or die "failed : $!";
+copy($epoc . "winscw/c/content.txt",							"temp/drmtest/general/content.txt") or die "failed : $!";
+copy($epoc . "winscw/c/content-noenc.odf",						"temp/drmtest/general/content-noenc.odf") or die "failed : $!";
+copy($epoc . "winscw/c/content.dcf",							"temp/drmtest/general/content.dcf") or die "failed : $!";
 
 system("7z a -tzip drmtest.zip ./temp/*");
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/locationsrv/landmarks_api/landmarks_api.pl
--- a/common/tools/ats/bctest/locationsrv/landmarks_api/landmarks_api.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/landmarks_api/landmarks_api.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -17,18 +17,18 @@
 use File::Path;
 
 unlink "landmarks_api.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/landmarks/general/testframework";
 mkpath "temp/landmarks/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("landmarks.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/testlandmarksapi.dll",				"temp/landmarks/winscw_udeb/testlandmarksapi.dll");
-copy($epoc . "winscw/c/testframework/TestFramework_Landmarks.ini",		"temp/landmarks/general/testframework/TestFramework_Landmarks.ini");
-copy($epoc . "winscw/c/testframework/testlandmarksapi.cfg",				"temp/landmarks/general/testframework/testlandmarksapi.cfg");
-copy($epoc . "winscw/c/testing/data/smiltemplate.mif",					"temp/landmarks/general/smiltemplate.mif");
-copy($epoc . "winscw/c/testing/data/testEposLmImport.lmx",				"temp/landmarks/general/testEposLmImport.lmx");
-copy($epoc . "winscw/c/testing/data/testEposLmImportCollection.lmx",	"temp/landmarks/general/testEposLmImportCollection.lmx");
+copy($epoc . "release/winscw/udeb/testlandmarksapi.dll",				"temp/landmarks/winscw_udeb/testlandmarksapi.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_Landmarks.ini",		"temp/landmarks/general/testframework/TestFramework_Landmarks.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testlandmarksapi.cfg",				"temp/landmarks/general/testframework/testlandmarksapi.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testing/data/smiltemplate.mif",					"temp/landmarks/general/smiltemplate.mif") or die "failed : $!";
+copy($epoc . "winscw/c/testing/data/testEposLmImport.lmx",				"temp/landmarks/general/testEposLmImport.lmx") or die "failed : $!";
+copy($epoc . "winscw/c/testing/data/testEposLmImportCollection.lmx",	"temp/landmarks/general/testEposLmImportCollection.lmx") or die "failed : $!";
 
 system("7z a -tzip landmarks_api.zip ./temp/*");
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.pl
--- a/common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -20,15 +20,15 @@
 use File::Path;
 
 unlink "lmdbmanagementtest.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/lmdbmanagementtest/general/testframework";
 mkpath "temp/lmdbmanagementtest/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("lmdbmanagement.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/testdbmanagementapi.dll",			"temp/lmdbmanagementtest/winscw_udeb/testdbmanagementapi.dll");
-copy($epoc . "winscw/c/testframework/testframework_lmdbmanagement.ini",	"temp/lmdbmanagementtest/general/testframework/testframework_lmdbmanagement.ini");
-copy($epoc . "winscw/c/testframework/testdbmanagementapi.cfg",				"temp/lmdbmanagementtest/general/testframework/testdbmanagementapi.cfg");
+copy($epoc . "release/winscw/udeb/testdbmanagementapi.dll",			"temp/lmdbmanagementtest/winscw_udeb/testdbmanagementapi.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_lmdbmanagement.ini",	"temp/lmdbmanagementtest/general/testframework/testframework_lmdbmanagement.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testdbmanagementapi.cfg",				"temp/lmdbmanagementtest/general/testframework/testdbmanagementapi.cfg") or die "failed : $!";
 
 system("7z a -tzip lmdbmanagementtest.zip ./temp/*");
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.pl
--- a/common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -20,15 +20,15 @@
 use File::Path;
 
 unlink "lmsearchtest.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/lmsearchtest/general/testframework";
 mkpath "temp/lmsearchtest/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("lmsearch.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/testlmksearchapi.dll",			"temp/lmsearchtest/winscw_udeb/testlmksearchapi.dll");
-copy($epoc . "winscw/c/testframework/TestFramework_lmsearch.ini",	"temp/lmsearchtest/general/testframework/TestFramework_lmsearch.ini");
-copy($epoc . "winscw/c/testframework/testlmksearchapi.cfg",			"temp/lmsearchtest/general/testframework/testlmksearchapi.cfg");
+copy($epoc . "release/winscw/udeb/testlmksearchapi.dll",			"temp/lmsearchtest/winscw_udeb/testlmksearchapi.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_lmsearch.ini",	"temp/lmsearchtest/general/testframework/TestFramework_lmsearch.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testlmksearchapi.cfg",			"temp/lmsearchtest/general/testframework/testlmksearchapi.cfg") or die "failed : $!";
 
 system("7z a -tzip lmsearchtest.zip ./temp/*");
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/locationsrv/locblid/locblid.pl
--- a/common/tools/ats/bctest/locationsrv/locblid/locblid.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locblid/locblid.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -20,16 +20,16 @@
 use File::Path;
 
 unlink "locblidtest.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/locblidtest/general/testframework";
 mkpath "temp/locblidtest/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("locblid.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/BCBlidTest.dll",					"temp/locblidtest/winscw_udeb/BCBlidTest.dll");
-copy($epoc . "winscw/c/testframework/testframework_locblid.ini",	"temp/locblidtest/general/testframework/testframework_locblid.ini");
-copy($epoc . "winscw/c/testframework/tcLmkBlid.cfg",				"temp/locblidtest/general/testframework/tcLmkBlid.cfg");
-copy($epoc . "winscw/c/testframework/UI_BCBLid.cfg",				"temp/locblidtest/general/testframework/UI_BCBLid.cfg");
+copy($epoc . "release/winscw/udeb/BCBlidTest.dll",					"temp/locblidtest/winscw_udeb/BCBlidTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_locblid.ini",	"temp/locblidtest/general/testframework/testframework_locblid.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcLmkBlid.cfg",				"temp/locblidtest/general/testframework/tcLmkBlid.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/UI_BCBLid.cfg",				"temp/locblidtest/general/testframework/UI_BCBLid.cfg") or die "failed : $!";
 
 system("7z a -tzip locblidtest.zip ./temp/*");
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/messaging/messaging.xml
--- a/common/tools/ats/bctest/messaging/messaging.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/messaging/messaging.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="" name="Messaging BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/messagingmw/sendui/sendui.xml
--- a/common/tools/ats/bctest/messagingmw/sendui/sendui.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/messagingmw/sendui/sendui.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="" name="Send UI BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/multimedia/multimediatest.xml
--- a/common/tools/ats/bctest/multimedia/multimediatest.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediatest.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="GENERIC" />
-			<property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="0.54" name="MultimediaSVSTests WINSCW UDEB" harness="GENERIC" enabled="true" passrate="100">
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/pim/clock/clock.xml
--- a/common/tools/ats/bctest/pim/clock/clock.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/pim/clock/clock.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="" name="PIM Clock BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/syslibs/syslibssvs.pl
--- a/common/tools/ats/bctest/syslibs/syslibssvs.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/syslibs/syslibssvs.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -28,16 +28,16 @@
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("syslibstest.xml",	"temp/test.xml");
 
-copy($epoc . "data/z/syslibs/t_syslibs.tcs",		"temp/syslibstest/general/syslibs/t_syslibs.tcs");
-copy($epoc . "data/z/syslibs/winscw/t_syslibs.ini",	"temp/syslibstest/general/syslibs/t_syslibs.ini");
+copy($epoc . "data/z/syslibs/t_syslibs.tcs",		"temp/syslibstest/general/syslibs/t_syslibs.tcs") or die "failed : $!";
+copy($epoc . "data/z/syslibs/winscw/t_syslibs.ini",	"temp/syslibstest/general/syslibs/t_syslibs.ini") or die "failed : $!";
 
-copy($epoc . "data/z/ecom/syslib-ecom-publicapi.script",	"temp/syslibstest/general/ecom/syslib-ecom-publicapi.script");
-copy($epoc . "data/z/ecom/syslib-ecom-publicapi.ini",		"temp/syslibstest/general/ecom/syslib-ecom-publicapi.ini");
-copy($epoc . "data/z/ecom/testproduct_plugin.rsc",			"temp/syslibstest/general/ecom/testproduct_plugin.rsc");
-copy($epoc . "release/winscw/udeb/testproduct_plugin.dll",	"temp/syslibstest/general/ecom/testproduct_plugin.dll");
+copy($epoc . "data/z/ecom/syslib-ecom-publicapi.script",	"temp/syslibstest/general/ecom/syslib-ecom-publicapi.script") or die "failed : $!";
+copy($epoc . "data/z/ecom/syslib-ecom-publicapi.ini",		"temp/syslibstest/general/ecom/syslib-ecom-publicapi.ini") or die "failed : $!";
+copy($epoc . "data/z/ecom/testproduct_plugin.rsc",			"temp/syslibstest/general/ecom/testproduct_plugin.rsc") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/testproduct_plugin.dll",	"temp/syslibstest/general/ecom/testproduct_plugin.dll") or die "failed : $!";
 
-copy($epoc . "release/winscw/udeb/t_ecom.exe",				"temp/syslibstest/winscw_udeb/t_ecom.exe");
-copy($epoc . "release/winscw/udeb/tpcopyfileutility.exe",	"temp/syslibstest/winscw_udeb/tpcopyfileutility.exe");
-copy($epoc . "release/winscw/udeb/tpdeletefileutility.exe",	"temp/syslibstest/winscw_udeb/tpdeletefileutility.exe");
+copy($epoc . "release/winscw/udeb/t_ecom.exe",				"temp/syslibstest/winscw_udeb/t_ecom.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tpcopyfileutility.exe",	"temp/syslibstest/winscw_udeb/tpcopyfileutility.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tpdeletefileutility.exe",	"temp/syslibstest/winscw_udeb/tpdeletefileutility.exe") or die "failed : $!";
 
 system("7z a -tzip syslibstest.zip ./temp/*");
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/systemsw/systemsw.pl
--- a/common/tools/ats/bctest/systemsw/systemsw.pl	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/systemsw/systemsw.pl	Thu Oct 01 13:22:04 2009 +0100
@@ -36,7 +36,7 @@
 copy($epoc . "release/winscw/udeb/sysutiltest.dll",				"temp/systemswtest/winscw_udeb/sysutiltest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/stiftextresolvertest.dll",	"temp/systemswtest/winscw_udeb/stiftextresolvertest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/hwresmantest.dll",			"temp/systemswtest/winscw_udeb/hwresmantest.dll") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/vibractrltest.dll",			"temp/systemswtest/winscw_udeb/vibractrltest.dll") or die "failed : $!";
+##copy($epoc . "release/winscw/udeb/vibractrltest.dll",			"temp/systemswtest/winscw_udeb/vibractrltest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/platformvertest.dll",			"temp/systemswtest/winscw_udeb/platformvertest.dll") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/accmonapibctests.dll",		"temp/systemswtest/winscw_udeb/accmonapibctests.dll") or die "failed : $!";
 
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/systemsw/systemsw.xml
--- a/common/tools/ats/bctest/systemsw/systemsw.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/systemsw/systemsw.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -337,38 +337,6 @@
 						</params>
 					</step>
 				</case>
-				<case id="" name="Vibration Control" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
-                    <step id="" name="vibractrltest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="vibractrltest.dll"/>
-							<param dst="c:\sys\bin\vibractrltest.dll"/>
-							<param component-path="systemswtest" />
-						</params>
-					</step>
-					<step id="" name="vibractrltest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule vibractrltest"/>
-                            <param result-file="c:\spd_logs\xml\vibractrltest.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="vibractrltest (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-				</case>
 				<case id="" name="Platform Version" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -438,5 +406,16 @@
 	</plan>
 	<files>
 		<file>systemswtest/winscw_udeb/featuremanagertest.dll</file>
+		<file>systemswtest/winscw_udeb/finditemenginetest.dll</file>
+		<file>systemswtest/winscw_udeb/light.dll</file>
+		<file>systemswtest/winscw_udeb/networkstatustest.dll</file>
+		<file>systemswtest/winscw_udeb/phoneparsertest.dll</file>
+		<file>systemswtest/winscw_udeb/platformenvtest.dll</file>
+		<file>systemswtest/winscw_udeb/powerstatetest.dll</file>
+		<file>systemswtest/winscw_udeb/sysutiltest.dll</file>
+		<file>systemswtest/winscw_udeb/stiftextresolvertest.dll</file>
+		<file>systemswtest/winscw_udeb/hwresmantest.dll</file>
+		<file>systemswtest/winscw_udeb/platformvertest.dll</file>
+		<file>systemswtest/winscw_udeb/accmonapibctests.dll</file>
 	</files>
 </test>
diff -r cd084e6d144e -r f0c8c9e2cbbd common/tools/ats/bctest/websrv/websrv.xml
--- a/common/tools/ats/bctest/websrv/websrv.xml	Thu Oct 01 13:13:06 2009 +0100
+++ b/common/tools/ats/bctest/websrv/websrv.xml	Thu Oct 01 13:22:04 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="" name="Web Services BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">