# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1254603255 -3600
# Node ID 0f19bbf75c06cfa8555aa057f88bae21c5106066
# Parent  499a0581085da8f0bd0ca5102f81a9359b9790ea
fixed up most of the issues with the dynamic bc test plans

diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/contacts/phonebook/phonebook.xml
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Sat Oct 03 21:54:15 2009 +0100
@@ -1976,12 +1976,12 @@
 		<file>phonebooktest/winscw_udeb/mtpbkiconinfo.dll</file>
 		<file>phonebooktest/general/testframework/testframework_pbkinfo.ini</file>
         <file>phonebooktest/general/testframework/tcbctestpbkinfo.cfg</file>
-        <file>phonebooktest/general/testframework/ui_tcbctestpbkinfo.cfg</file>
+        <file>phonebooktest/general/testframework/ui_bctestpbkinfo.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkiconid.dll</file>
 		<file>phonebooktest/general/testframework/testframework_pbkicon.ini</file>
         <file>phonebooktest/general/testframework/tcbctestpbkicon.cfg</file>
-        <file>phonebooktest/general/testframework/ui_tcbctestpbkicon.cfg</file>
+        <file>phonebooktest/general/testframework/ui_bctestpbkicon.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkfields.dll</file>
 		<file>phonebooktest/general/testframework/testframework_pbkfeilds.ini</file>
@@ -1991,7 +1991,7 @@
 		<file>phonebooktest/winscw_udeb/mtpbkfielddata.dll</file>
 		<file>phonebooktest/general/testframework/testframework_pbkfdata.ini</file>
         <file>phonebooktest/general/testframework/tcbctestpbkfdata.cfg</file>
-        <file>phonebooktest/general/testframework/ui_tcbctestpbkfdata.cfg</file>
+        <file>phonebooktest/general/testframework/ui_bctestpbkfdata.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactiter.dll</file>
 		<file>phonebooktest/general/testframework/testframework_pbkiter.ini</file>
diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/drm/drm.xml
--- a/common/tools/ats/bctest/drm/drm.xml	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/drm/drm.xml	Sat Oct 03 21:54:15 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="Digital Rights Managment BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/locationsrv/landmarks_api/landmarks.xml
--- a/common/tools/ats/bctest/locationsrv/landmarks_api/landmarks.xml	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/landmarks_api/landmarks.xml	Sat Oct 03 21:54:15 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="Landmarks API BCTests WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.xml
--- a/common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.xml	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.xml	Sat Oct 03 21:54:15 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="Landmarks Database Management BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.xml
--- a/common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.xml	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.xml	Sat Oct 03 21:54:15 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="Landmarks Search BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/package_definition.xml
--- a/common/tools/ats/bctest/package_definition.xml	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml	Sat Oct 03 21:54:15 2009 +0100
@@ -145,11 +145,12 @@
 				<command cmd="&cmd_update;" dir="sf/os/shortlinksrv" />
 				<command cmd="&cmd_clone;		&codeline_sfl_fcl;/sftools/ana/compatanamdw		sftools/ana/compatanamdw" />
 				<command cmd="&cmd_wget;		http://developer.symbian.org/wiki/images/e/e7/Xvid.zip" />
-				<command cmd="&cmd_unzip;		xvid.zip" />
+				<command cmd="&cmd_makedirs;	xvid" />
+				<command cmd="&cmd_unzip;		xvid.zip xvid/" />
 				<command cmd="&cmd_perl;		sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/group/SetEnv.pl" />
 			</meta>
 		</layer>
-		<layer name="bld_production" long-name="Binary Compatability Production code build" levels="generic specific">
+		<layer name="bld-production" long-name="Binary Compatability Production code build" levels="generic specific">
 			<collection name="aspconnectionsis" long-name="50_asp_connection.sis">
 				<component id="aspconnection" name="ASP Connection Test">
 					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/>
@@ -176,37 +177,35 @@
 				</component>	
 			</collection>
 
-					<component id="lmksearch" name="Landmark Search Test">
-						<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
-					</component>
-					<component id="lmkdbmgmt" name="Landmark Database Management Test">
-						<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group"/>
-					</component>
-					<component id="landmarks" name="Landmarks API Test">
-						<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
-					</component>
+			<component id="lmksearch" name="Landmark Search Test">
+				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
+			</component>
+			<component id="lmkdbmgmt" name="Landmark Database Management Test">
+				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group"/>
+			</component>
+			<component id="landmarks" name="Landmarks API Test">
+				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
+			</component>
 
 			<collection name="mmsclientmtmsis" long-name="50_Messaging_MMSClientMTM.SIS">
 				<component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
 					<unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
 				</component>
 			</collection>
-
 			<collection name="senduiapisis" long-name="50_msg_sendui.sis">
 				<component id="sendui" name="Messaging Send UI API BC Test">
 					<unit bldFile="sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/>
 				</component>
 			</collection>
-
 			<collection name="pluginbiosis" long-name="50_Messaging_PluginBio.sis">
 				<component id="pluginbio" name="Messaging Plugin BIO BC Test">
 					<unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
 				</component>
 			</collection>
 
-					<component id="drmcaf" name="DRM CAF BC Test">
-						<unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
-					</component>
+			<component id="drmcaf" name="DRM CAF BC Test">
+				<unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
+			</component>
 
 			<collection name="pbkdataaddeditsis" long-name="50_PIM_PbkDataAddEdit.SIS">
 				<component id="pbkdataaddedit" name="Phonebook Data Add Edit BC Test">
@@ -226,18 +225,18 @@
 				</component>
 			</collection>
 
-					<component id="pbkuiutil" name="Phonebook UI Utils BC Test">
-						<unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/>
-					</component>
-					<component id="pbkvcard" name="Phonebook vCard Import Export BC Test">
-						<unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/>
-					</component>
-					<component id="pbkspeeddial" name="Phonebook Speed Dial BC Test">
-						<unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/>
-					</component>
-					<component id="proengwrap" name="Profiles Engine Wrapper Test">
-						<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group"/>
-					</component>
+			<component id="pbkuiutil" name="Phonebook UI Utils BC Test">
+				<unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/>
+			</component>
+			<component id="pbkvcard" name="Phonebook vCard Import Export BC Test">
+				<unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/>
+			</component>
+			<component id="pbkspeeddial" name="Phonebook Speed Dial BC Test">
+				<unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/>
+			</component>
+			<component id="proengwrap" name="Profiles Engine Wrapper Test">
+				<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group"/>
+			</component>
 
 			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
 				<component id="testfwsrv" name="Multimedia Test Framework Server">
@@ -245,55 +244,13 @@
 				</component>
 			</collection>
 
-			<collection name="systemswsis" long-name="50_systemsw.sis">
-				<component id="systemsw" name="System Software">
-					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/systemsw/group"/>
-				</component>
-				<component id="featurediscovery" name="Feature Discovery API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/>
-				</component>
-				<component id="finditem" name="Find Item API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/>
-				</component>
-				<component id="light" name="Light API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/>
-				</component>
-				<component id="phoneparser" name="Phone Parser API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/>
-				</component>
-				<component id="platformenv" name="Platform Environment API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/>
-				</component>
-				<component id="powerstate" name="HW Resource Management Power State API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/>
-				</component>
-				<component id="sysutil" name="System Utilities API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/>
-				</component>
-				<component id="textresolver" name="Text Resolver API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/>
-				</component>
-				<component id="vibra" name="Vibra API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/>
-				</component>
-				<component id="platformvertest" name="Platform Version Test">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/>
-				</component>
-				<component id="accmonapibctests" name="Accessory Monitoring API BC Test">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/>
-				</component>
-				<component id="networkstatus" name="Network Status API">
-					<unit bldFile="sf/mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/>
-				</component>
-			</collection>
-
 			<collection name="proengwrapsis" long-name="50_SP_PROENG.SIS">
 				<component id="proeng" name="Profile Engine Wrapper">
 					<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/>
 				</component>
 			</collection>
 		</layer>
-		<layer name="bld_test" long-name="Binary Compatability Test code build" levels="generic specific">
+		<layer name="bld-test" long-name="Binary Compatability Test code build" levels="generic specific">
 			<collection name="basesvs" long-name="SVS Base API Tests">
 				<component id="basesvs" name="SVS Base API Tests" class="test">
 					<unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/pim/clock/clock.pl
--- a/common/tools/ats/bctest/pim/clock/clock.pl	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/pim/clock/clock.pl	Sat Oct 03 21:54:15 2009 +0100
@@ -20,7 +20,7 @@
 use File::Path;
 
 unlink "clocktest.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/clocktest/general/testframework";
 mkpath "temp/clocktest/general/bcardtest2";
 mkpath "temp/clocktest/winscw_udeb/z/resource/plugins";
@@ -28,9 +28,9 @@
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("clock.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/bctestclock.dll",					"temp/clocktest/winscw_udeb/bctestclock.dll");
-copy($epoc . "winscw/c/testframework/testframework_pimclock.ini",	"temp/clocktest/general/testframework/testframework_pimclock.ini");
-copy($epoc . "winscw/c/testframework/tcbctestclock.cfg",			"temp/clocktest/general/testframework/tcbctestclock.cfg");
-copy($epoc . "winscw/c/testframework/ui_bctestclock.cfg",			"temp/clocktest/general/testframework/ui_bctestclock.cfg");
+copy($epoc . "release/winscw/udeb/bctestclock.dll",					"temp/clocktest/winscw_udeb/bctestclock.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_pimclock.ini",	"temp/clocktest/general/testframework/testframework_pimclock.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcbctestclock.cfg",			"temp/clocktest/general/testframework/tcbctestclock.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/ui_bctestclock.cfg",			"temp/clocktest/general/testframework/ui_bctestclock.cfg") or die "failed : $!";
 
 system("7z a -tzip clocktest.zip ./temp/*");
diff -r 499a0581085d -r 0f19bbf75c06 common/tools/ats/bctest/syslibs/syslibstest.xml
--- a/common/tools/ats/bctest/syslibs/syslibstest.xml	Thu Oct 01 14:54:20 2009 +0100
+++ b/common/tools/ats/bctest/syslibs/syslibstest.xml	Sat Oct 03 21:54:15 2009 +0100
@@ -4,14 +4,13 @@
 	<owner>admin</owner>
 	<priority>10</priority>
 	<buildid></buildid>
-	<name>multimediaSVStest</name>
+	<name>OS Services SVS Tests</name>
 	<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="SyslibsSVSTests WINSCW UDEB" harness="GENERIC" enabled="true" passrate="100">
+	<plan id="" name="OS Services SVS Tests WINSCW UDEB" harness="GENERIC" enabled="true" passrate="100">
 		<target>
 			<device rank="master" alias="emulator_udeb"/>
 		</target>