# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1255949385 -3600
# Node ID a7fa60f12ba2b67bf3121775c82c7fba47794e25
# Parent  c027e7c6431ee57a61168958aaeffdabdb5bb303# Parent  5fac205a712c66ca594a4c3bf1d7e1213a0b0dce
Catchup merge of tags

diff -r 5fac205a712c -r a7fa60f12ba2 common/build.postbuild.xml
--- a/common/build.postbuild.xml	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/build.postbuild.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -45,7 +45,13 @@
               </then>
             </if>
         </parallel>
-        
+
+        <!-- Generate release_metadata entries for the md5 zips -->
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="bin-just-metadata" />
+        </antcall>
+ 
         <!-- Launch smoketest -->
         <if><istrue value="${sf.spec.test.sendpkg.enable}"/>
             <then>
@@ -63,6 +69,7 @@
 
         <!-- Zip up all the logs -->
         <runtarget target="sf-zip-logs"/>
+        <runtarget target="sf-brag-to-diamonds"/>
 
         <!-- Publish logs/reports -->
         <if>
@@ -77,130 +84,129 @@
     <target name="sf-tag-hg-code">
         <property name="sf.tagafterbuild.tag" value="${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}"/>
         <fmpp sourceFile="${sf.common.config.dir}/templates/tag-hg-code.ant.xml.ftl"
-              outputFile="${sf.common.config.dir}/generated/tag-hg-code.ant.xml">
+              outputFile="${temp.build.dir}/tag-hg-code.ant.xml">
             <data expandProperties="yes">
                 ant: antProperties()
                 data: csv(${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
             </data>
         </fmpp>
-        <ant antfile="${sf.common.config.dir}/generated/tag-hg-code.ant.xml"/>
+        <ant antfile="${temp.build.dir}/tag-hg-code.ant.xml"/>
     </target>
 
-    <target name="sf-run-evalid">
+    <target name="sf-run-evalid" >
         <delete dir="${build.drive}/output/md5"/>
         <mkdir  dir="${build.drive}/output/md5"/>
 
         <parallel>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/include output/md5/epoc32_include.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/s60 output/md5/epoc32_s60.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/localisation output/md5/epoc32_localisation.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -x \.sym$ -x ^armv5/udeb -x ^armv5/urel -x ^winscw/udeb -x ^winscw/urel -g epoc32/release output/md5/epoc32_release.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -x \.sym$ -g epoc32/release/armv5/udeb output/md5/epoc32_release_armv5_udeb.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -x \.sym$ -g epoc32/release/armv5/urel output/md5/epoc32_release_armv5_urel.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -x \.sym$ -g epoc32/release/winscw/udeb output/md5/epoc32_release_winscw_udeb.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -x \.sym$ -g epoc32/release/winscw/urel output/md5/epoc32_release_winscw_urel.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/cshlpcmp_template 	output/md5/epoc32_cshlpcmp_template.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/data output/md5/epoc32_data.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/engdoc output/md5/epoc32_engdoc.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/engineeringtools output/md5/epoc32_engineeringtools.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/gcc output/md5/epoc32_gcc.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/gcc_mingw output/md5/epoc32_gcc_mingw.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/ksa output/md5/epoc32_ksa.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/rom output/md5/epoc32_rom.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/rombuild output/md5/epoc32_rombuild.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/sbs_config output/md5/epoc32_sbs_config.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/sdk_special output/md5/epoc32_sdk_special.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/stdapis output/md5/epoc32_stdapis.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/stubs output/md5/epoc32_stubs.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/tools output/md5/epoc32_tools.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/wins output/md5/epoc32_wins.md5"/>
         </exec>
-        <exec executable="cmd" dir="${build.drive}">
+        <exec executable="cmd" dir="${build.drive}/">
             <arg value="/c"/>
             <arg value="evalid -g epoc32/winscw output/md5/epoc32_winscw.md5"/>
         </exec>
         </parallel>
-        
         <!-- package MD5s directly into epoc32/relinfo location so that its usable out-of-the-box -->
-		<mkdir dir="${build.output.dir}/zips/release"/> <!-- Hack to prevent non-existing release dir -->
+    		<mkdir dir="${build.output.dir}/zips/release"/> <!-- Hack to prevent non-existing release dir -->
         <zip destfile="${build.output.dir}/zips/release/build_md5.zip">
             <zipfileset dir="${build.drive}/output/md5/" prefix="epoc32/relinfo"/>
         </zip>
     </target>    
     
-    <target name="sf-package-binary" depends="sf-preprocess-package-config,sf-package-postbuild-rnd">
+    <target name="sf-package-binary" depends="sf-package-postbuild-rnd">
         <!-- Warning: Reverting to using the He zipper will also revert to a single zip for the binaries:
              would need to update the template and possibly the script that populates it -->
         <!--antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
             <param name="zip.target.name" value="bin" />
         </antcall-->
         <parallel>
@@ -237,19 +243,19 @@
         </parallel>
         <!-- Generate release_metadata entries for the above zips -->
         <antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
             <param name="zip.target.name" value="bin-just-metadata" />
         </antcall>
     </target>
 
-    <target name="sf-package-postbuild-rnd" depends="sf-preprocess-package-config">
+    <target name="sf-package-postbuild-rnd" >
         <antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
             <param name="zip.target.name" value="rnd-postbuild" />
         </antcall>
     </target>
 
-    <target name="sf-package-tools" depends="sf-preprocess-package-config">
+    <target name="sf-package-tools" >
         <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
             <arg value="a"/>
             <arg value="-tzip"/>
@@ -258,7 +264,7 @@
             <arg value="epoc32/tools"/>
         </exec>
         <antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
             <param name="zip.target.name" value="tools" />
         </antcall>
     </target>
@@ -288,7 +294,6 @@
           <istrue value="${sf.spec.publish.enable}"/>
             <then>
             <runtarget target="sf-run-analysis-diamonds"/>
-          	<runtarget target="sf-brag-to-diamonds"/>
             </then>
         </if>
     </target>
@@ -514,7 +519,7 @@
 
     <target name="sf-brag-to-diamonds">
         <!-- Merge all our bits of XML together -->
-        <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml">
+        <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml" logError="true">
             <arg value="${sf.common.config.dir}/tools/mergeXML.pl"/>
             <arg value="--xsl=brag.xsl"/>
             <arg value="--merge=buildStatus,phase(name),step(name),failures(level)"/>
@@ -612,7 +617,7 @@
     </target>
 
     <!-- package all logs into zipfile for publishing -->
-    <target name="sf-zip-logs">
+    <target name="sf-zip-logs" >
         <if>
             <istrue value="${sf.spec.logs.zip.enable}"/>
             <then>
@@ -629,6 +634,10 @@
                     <zipfileset dir="${build.drive}/output/logs/BOM" prefix="build_info/logs/BOM"/>
                     <zipfileset dir="${build.drive}/output/logs/releaseables" prefix="build_info/logs/releaseables"/>
                 </zip>
+                <antcall target="sf-zip-content">
+                    <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
+                    <param name="zip.target.name" value="info-just-metadata" />
+                </antcall>
             </then>
         </if>
      </target>
@@ -769,6 +778,7 @@
             </then>
         </if>
         <runtarget target="sf-zip-logs"/>
+        <runtarget target="sf-brag-to-diamonds"/>
         <if>
             <istrue value="${sf.spec.publish.enable}" />
             <then>
diff -r 5fac205a712c -r a7fa60f12ba2 common/build.xml
--- a/common/build.xml	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/build.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -57,7 +57,7 @@
     <!-- setup conditional Helium internal properties -->
     <if><istrue value="${sf.spec.sourcesync.usecache}"/>
         <then>
-            <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.common.config.dir}/generated"/>
+            <property name="sf.spec.sourcesync.sourcespecdir" value="${temp.build.dir}"/>
         </then>
         <else>
             <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.project.location}"/>
@@ -65,10 +65,10 @@
     </if>
     
     <!-- conditional import of generated source spec if available -->
-    <if><available  file="${sf.common.config.dir}/generated/source-spec.ant.xml" />
+    <if><available  file="${temp.build.dir}/source-spec.ant.xml" />
         <then>
             <echo message="Generated source spec found, importing..." />
-            <import file="${sf.common.config.dir}/generated/source-spec.ant.xml"/>
+            <import file="${temp.build.dir}/source-spec.ant.xml"/>
         </then>
     </if>
     
@@ -164,12 +164,11 @@
         <if><istrue value="${sf.spec.sourcesync.usecache}"/>
             <then>
                 <echo message="Generating Hg local cache..." />
-                <mkdir dir="${sf.common.config.dir}/generated"/>
                 <exec executable="perl" dir="${build.log.dir}" failonerror="true" output="${build.log.dir}/${build.id}_hgcache.log">
                     <arg value="${sf.common.config.dir}/tools/cachefiles.pl"/>
                     <arg value="${sf.spec.sourcesync.cachelocation}"/>
                     <arg value="${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}"/>
-                    <arg value="${sf.common.config.dir}/generated/${sf.spec.sourcesync.sourcespecfile}"/>
+                    <arg value="${temp.build.dir}/${sf.spec.sourcesync.sourcespecfile}"/>
                 </exec>
             </then>
         </if>
@@ -177,10 +176,10 @@
         <!-- TODO: 1. Same file name souce-spec.ant.xml is used for all packages
         for multiple package builds, this needs to be linked with package name. -->
         <!-- TODO: 2. Change fmpp data to be a full property rather than relative path -->
-        <delete file="${sf.common.config.dir}/generated/source-spec.ant.xml"/>
+        <delete file="${temp.build.dir}/source-spec.ant.xml"/>
         
         <fmpp sourceFile="${sf.common.config.dir}/templates/source-spec.ant.xml.ftl"
-              outputFile="${sf.common.config.dir}/generated/source-spec.ant.xml">
+              outputFile="${temp.build.dir}/source-spec.ant.xml">
               <data expandProperties="yes">
                     ant: antProperties()
                     data: csv(${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
@@ -394,13 +393,13 @@
       <then>
         <echo message="Executing truclean step."/>
         <fmpp sourceFile="${sf.common.config.dir}/templates/truclean.ant.xml.ftl"
-            outputFile="${sf.common.config.dir}/generated/truclean.ant.xml">
+            outputFile="${temp.build.dir}/truclean.ant.xml">
           <data expandProperties="yes">
               ant: antProperties()
               data: csv(${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
           </data>
         </fmpp>
-        <ant antfile="${sf.common.config.dir}/generated/truclean.ant.xml"/>
+        <ant antfile="${temp.build.dir}/truclean.ant.xml"/>
       </then>
       <else>
         <echo message="Skipping truclean step."/>
@@ -429,7 +428,7 @@
   </target>
     
     <target name="sf-get-source" depends="sf-generate-source-spec">
-        <ant antfile="${sf.common.config.dir}/generated/source-spec.ant.xml" />
+        <ant antfile="${temp.build.dir}/source-spec.ant.xml" />
     </target>
     
     <target name="sf-diamondize-bom" depends="sf-record-proj-conf-bom">
@@ -449,13 +448,12 @@
     </target>
 
     <target name="sf-preprocess-package-config">
-        <mkdir dir="${sf.common.config.dir}/generated"/>
 	<echo message="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
         <exec executable="perl" dir="${build.drive}/" failonerror="false" output="${build.log.dir}/zipconfig.log">
             <arg value="${sf.common.config.dir}/tools/populateziptemplate.pl"/>
             <arg value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
             <arg value="${sf.common.config.dir}/templates/zip.cfg.xml.ftl.template"/>
-            <arg value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <arg value="${temp.build.dir}/zip.cfg.xml.ftl"/>
             <arg value="${build.log.dir}/rnd_excludefile.txt"/>
         </exec>
         <antcall target="sf-log-to-brag">
@@ -466,20 +464,53 @@
         </antcall>
     </target>
     
-    <target name="sf-zip-content" depends="preprocess-zip-config">
-        <property name="zip.${zip.target.name}.log.file" location="${build.log.dir}/${build.id}_${zip.target.name}_zip.log" />
-        <property name="zips.${zip.target.name}.spec.name" value="${zip.target.name}" />
-        <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" />
+    <target name="sf-zip-content">
+        <!-- If it's the file we use for everything, and it's not up to date... -->
+        <if>
+          <and>
+            <equals arg1="${zip.config.file}" arg2="${temp.build.dir}/zip.cfg.xml.ftl"/>
+            <not>
+              <and>
+                <uptodate targetfile="${temp.build.dir}/zip.cfg.xml.ftl">
+                  <srcfiles dir="${sf.common.config.dir}">
+                    <include name="tools/populateziptemplate.pl"/>
+                    <include name="templates/zip.cfg.xml.ftl.template"/>
+                  </srcfiles>
+                </uptodate>
+                <uptodate targetfile="${temp.build.dir}/zip.cfg.xml.ftl">
+                  <srcfiles dir="${sf.spec.sourcesync.sourcespecdir}">
+                    <include name="${sf.spec.sourcesync.sourcespecfile}"/>
+                  </srcfiles>
+                </uptodate>
+              </and>
+            </not>
+          </and>
+          <then>
+            <!-- (Re)build the packaging config file -->      
+            <runtarget target="sf-preprocess-package-config"/>
+          </then>  
+        </if>
+        <if><available file="${zip.config.file}"/>
+          <then>
+            <runtarget target="preprocess-zip-config" />
+            <property name="zip.${zip.target.name}.log.file" location="${build.log.dir}/${build.id}_${zip.target.name}_zip.log" />
+            <property name="zips.${zip.target.name}.spec.name" value="${zip.target.name}" />
+            <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" />
+          </then>
+          <else>
+            <echo message="ERROR ${zip.config.file} not available for zipping!"/>
+          </else>
+        </if>
     </target>
     
-    <target name="sf-package-source" depends="sf-preprocess-package-config">
+    <target name="sf-package-source" >
         <!-- Firstly zip up rnd by package -->
         <antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
             <param name="zip.target.name" value="rnd" />
         </antcall>
         <antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
             <param name="zip.target.name" value="rnd-internal" />
         </antcall>
         <if>
@@ -487,12 +518,12 @@
             <then>
                 <echo message="INFO Packaging Source Repos"/>
                 <antcall target="sf-zip-content">
-                    <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+                    <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
                     <param name="zip.target.name" value="src" />
                 </antcall>
                 <!-- Then zip up src zips by layer -->
                 <antcall target="sf-zip-content">
-                    <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+                    <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
                     <param name="zip.target.name" value="src-by-layer" />
                 </antcall>
             </then>
@@ -537,6 +568,6 @@
         <!-- And copy the XSL so the output can be transformed by a browser -->
         <copy file="${sf.common.config.dir}/tools/brag/brag.xsl" toDir="${build.log.dir}/summary/"/>
     </target>
-
+    
 </project>
 
diff -r 5fac205a712c -r a7fa60f12ba2 common/templates/zip.cfg.xml.ftl.template
--- a/common/templates/zip.cfg.xml.ftl.template	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/templates/zip.cfg.xml.ftl.template	Mon Oct 19 11:49:45 2009 +0100
@@ -143,5 +143,27 @@
 				<set name="name" value="binaries_winscw"/>
 			</config>
 		</config>
+		<!-- "Null" info entries, which match no files, but do populate the release_metadata.xml -->
+		<config name="info-just-metadata" abstract="true">
+			<set name="archives.dir" value="${build.output.dir}/zips/release" />
+			<set name="include" value="*"/>
+			<set name="exclude" value="**"/>
+			<config name="logs">
+				<set name="name" value="build_logs"/>
+				<set name="grace.filters" value="logs"/>
+			</config>
+			<config name="BOM">
+				<set name="name" value="build_BOM"/>
+				<set name="grace.filters" value="info"/>
+			</config>
+		</config>
+		<!-- "Null" md5 entry, which matches no files, but does populate the release_metadata.xml -->
+		<config name="md5-just-metadata" abstract="true">
+			<set name="archives.dir" value="${build.output.dir}/zips/release" />
+			<set name="name" value="build_md5"/>
+			<set name="grace.filters" value="info"/>
+			<set name="include" value="*"/>
+			<set name="exclude" value="**"/>
+		</config>
 	</config>
 </build>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/connset/connset.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connset/connset.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Connection Settings BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "connsettest.zip";
+rmtree "temp";
+mkpath "temp/connsettest/general/testframework";
+mkpath "temp/connsettest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("connset.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/BcCMManagerEngineTester.dll",		"temp/connsettest/winscw_udeb/BcCMManagerEngineTester.dll") or die "failed : $!";
+#copy($epoc . "release/winscw/udeb/connset.exe",						"temp/connsettest/winscw_udeb/connset.exe") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_connset.ini",	"temp/connsettest/general/testframework/TestFramework_connset.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BcCMManagerEngineTester.cfg",	"temp/connsettest/general/testframework/BcCMManagerEngineTester.cfg") or die "failed : $!";
+
+system("7z a -tzip connsettest.zip ./temp/*");
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/connset/connset.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connset/connset.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>Connection Settings BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Connection Settings BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Connection Settings Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="connset" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="connset" 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="BcCMManagerEngineTester.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="BcCMManagerEngineTester.dll"/>
+							<param dst="c:\sys\bin\BcCMManagerEngineTester.dll"/>
+							<param component-path="connsettest" />
+						</params>
+					</step>
+					<step id="" name="TestFramework_connset.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/TestFramework_connset.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="connsettest" />
+						</params>
+					</step>
+					<step id="" name="BcCMManagerEngineTester.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/BcCMManagerEngineTester.cfg"/>
+							<param dst="c:\testframework\BcCMManagerEngineTester.cfg"/>
+							<param component-path="connsettest" />
+						</params>
+					</step>
+					<step id="" name="BcCMManagerEngineTester (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config c:\testframework\BcCMManagerEngineTester.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="BcCMManagerEngineTester (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>connsettest/winscw_udeb/BcCMManagerEngineTester.dll</file>
+		<file>connsettest/general/testframework/TestFramework_connset.ini</file>
+		<file>connsettest/general/testframework/BcCMManagerEngineTester.cfg</file>
+	</files>
+</test>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/connsetui/connsetui.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connsetui/connsetui.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Connection Settings UI BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "connsetuitest.zip";
+rmtree "temp";
+mkpath "temp/connsetuitest/general/testframework";
+mkpath "temp/connsetuitest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("connsetui.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/BCConnSettingsUITest.dll",		"temp/connsetuitest/winscw_udeb/BCConnSettingsUITest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_connsetui.ini",	"temp/connsetuitest/general/testframework/TestFramework_connsetui.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/UI_ConnSet.cfg",				"temp/connsetuitest/general/testframework/UI_ConnSet.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcConnSet.cfg",				"temp/connsetuitest/general/testframework/tcConnSet.cfg") or die "failed : $!";
+
+system("7z a -tzip connsetuitest.zip ./temp/*");
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/connsetui/connsetui.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connsetui/connsetui.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>Connection Settings UI BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Connection Settings UI BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Connection Settings UI Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="connsetui" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="connsetui" 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="BCConnSettingsUITest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcconnsettingsuitest.dll"/>
+							<param dst="c:\sys\bin\bcconnsettingsuitest.dll"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="TestFramework_connsetui.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_connsetui.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="UI_ConnSet.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/ui_connset.cfg"/>
+							<param dst="c:\testframework\ui_connset.cfg"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="tcConnSet.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tcconnset.cfg"/>
+							<param dst="c:\testframework\tcconnset.cfg"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="tcConnSet (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testcombiner -config c:\testframework\tcConnSet.cfg"/>
+							<param result-file="c:\spd_logs\xml\testcombiner.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tcConnSet (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>connsetuitest/winscw_udeb/bcconnsettingsuitest.dll</file>
+		<file>connsetuitest/general/testframework/testframework_connsetui.ini</file>
+		<file>connsetuitest/general/testframework/ui_connset.cfg</file>
+		<file>connsetuitest/general/testframework/tcConnSet.cfg</file>
+	</files>
+</test>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/contacts/phonebook/phonebook.pl
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -22,8 +22,9 @@
 unlink "phonebooktest.zip";
 rmtree "temp";
 mkpath "temp/phonebooktest/general/testframework";
+mkpath "temp/phonebooktest/general/resource";
 mkpath "temp/phonebooktest/general/bcardtest2";
-mkpath "temp/phonebooktest/winscw_udeb/z/resource/plugins";
+mkpath "temp/phonebooktest/winscw_udeb/z/resource";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("phonebook.xml",	"temp/test.xml");
@@ -34,65 +35,44 @@
 copy($epoc . "winscw/c/testframework/ui_bctestpbkdataaddedit.cfg",				"temp/phonebooktest/general/testframework/ui_bctestpbkdataaddedit.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtrpbkviewresourcefile.dll",					"temp/phonebooktest/winscw_udeb/mtrpbkviewresourcefile.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkvrsc.ini",				"temp/phonebooktest/general/testframework/testframework_pbkvrsc.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkvrsc.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkvrsc.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkvrsc.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkvrsc.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkidlefinder.dll",							"temp/phonebooktest/winscw_udeb/mtpbkidlefinder.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkifinder.ini",				"temp/phonebooktest/general/testframework/testframework_pbkifinder.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkifinder.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkifinder.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkifinder.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkifinder.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkiconinfo.dll",							"temp/phonebooktest/winscw_udeb/mtpbkiconinfo.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkinfo.ini",				"temp/phonebooktest/general/testframework/testframework_pbkinfo.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkinfo.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkinfo.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkinfo.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkinfo.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkiconid.dll",								"temp/phonebooktest/winscw_udeb/mtpbkiconid.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkicon.ini",				"temp/phonebooktest/general/testframework/testframework_pbkicon.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkicon.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkicon.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkicon.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkicon.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkfields.dll",								"temp/phonebooktest/winscw_udeb/mtpbkfields.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkfeilds.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfeilds.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkfeilds.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkfeilds.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkfeilds.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkfeilds.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkfielddata.dll",							"temp/phonebooktest/winscw_udeb/mtpbkfielddata.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkfdata.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfdata.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkfdata.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkfdata.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkfdata.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkfdata.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactiter.dll",						"temp/phonebooktest/winscw_udeb/mtpbkcontactiter.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkiter.ini",				"temp/phonebooktest/general/testframework/testframework_pbkiter.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkiter.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkiter.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkiter.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkiter.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactitemfield.dll",					"temp/phonebooktest/winscw_udeb/mtpbkcontactitemfield.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkcif.ini",					"temp/phonebooktest/general/testframework/testframework_pbkcif.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkcif.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkcif.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkcif.cfg",						"temp/phonebooktest/general/testframework/ui_bctestpbkcif.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactengine.dll",						"temp/phonebooktest/winscw_udeb/mtpbkcontactengine.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_cengine.ini",				"temp/phonebooktest/general/testframework/testframework_cengine.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestcengine.cfg",						"temp/phonebooktest/general/testframework/tcbctestcengine.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestcengine.cfg",						"temp/phonebooktest/general/testframework/ui_bctestcengine.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkfieldsinfo.dll",							"temp/phonebooktest/winscw_udeb/mtpbkfieldsinfo.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkfinfo.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfinfo.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkfinfo.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkfinfo.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkfinfo.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkfinfo.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactitem.dll",						"temp/phonebooktest/winscw_udeb/mtpbkcontactitem.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbkcitem.ini",				"temp/phonebooktest/general/testframework/testframework_pbkcitem.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbkcitem.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkcitem.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkcitem.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkcitem.cfg") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkcontactchangenotifier.dll",				"temp/phonebooktest/winscw_udeb/mtpbkcontactchangenotifier.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_pbknotifier.ini",			"temp/phonebooktest/general/testframework/testframework_pbknotifier.ini") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/tcbctestpbknotifier.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbknotifier.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkpbknotifier.cfg",				"temp/phonebooktest/general/testframework/ui_bctestpbkpbknotifier.cfg") or die "failed : $!";
 
+copy($epoc . "winscw/c/testframework/testframework_pbkdmngt.ini",				"temp/phonebooktest/general/testframework/testframework_pbkdmngt.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcbctestpbkdatamngt.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkdatamngt.cfg") or die "failed : $!";
+
 copy($epoc . "release/winscw/udeb/mtpbksmsaddressselect.dll",					"temp/phonebooktest/winscw_udeb/mtpbksmsaddressselect.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_smsaddsel.ini",				"temp/phonebooktest/general/testframework/testframework_smsaddsel.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestsmsaddsel.cfg",					"temp/phonebooktest/general/testframework/tcbctestsmsaddsel.cfg") or die "failed : $!";
@@ -152,13 +132,13 @@
 copy($epoc . "winscw/c/testframework/testframework_pbkaddsel.ini",				"temp/phonebooktest/general/testframework/testframework_pbkaddsel.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestpbkaddsel.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkaddsel.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestpbkaddsel.cfg",					"temp/phonebooktest/general/testframework/ui_bctestpbkaddsel.cfg") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/z/resource/pbkaddressselect.rsc",				"temp/phonebooktest/winscw_udeb/z/resource/plugins/pbkaddressselect.rsc") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/z/resource/pbkaddressselect.rsc",				"temp/phonebooktest/general/resource/pbkaddressselect.rsc") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkphonenumberselectbase.dll",				"temp/phonebooktest/winscw_udeb/mtpbkphonenumberselectbase.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_numsel.ini",					"temp/phonebooktest/general/testframework/testframework_numsel.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestnumsel.cfg",						"temp/phonebooktest/general/testframework/tcbctestnumsel.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestnumsel.cfg",						"temp/phonebooktest/general/testframework/ui_bctestnumsel.cfg") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/z/resource/mt_cpbkphonenumberselectbase.rsc",	"temp/phonebooktest/winscw_udeb/z/resource/plugins/mt_cpbkphonenumberselectbase.rsc") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/z/resource/mt_cpbkphonenumberselectbase.rsc",	"temp/phonebooktest/winscw_udeb/z/resource/mt_cpbkphonenumberselectbase.rsc") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/mtpbkselectfielddlg.dll",						"temp/phonebooktest/winscw_udeb/mtpbkselectfielddlg.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_fielddlg.ini",				"temp/phonebooktest/general/testframework/testframework_fielddlg.ini") or die "failed : $!";
@@ -170,6 +150,9 @@
 copy($epoc . "winscw/c/testframework/tcbctestsifielddlg.cfg",					"temp/phonebooktest/general/testframework/tcbctestsifielddlg.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_bctestsifielddlg.cfg",					"temp/phonebooktest/general/testframework/ui_bctestsifielddlg.cfg") or die "failed : $!";
 
+copy($epoc . "winscw/c/testframework/testframework_pbkfetch.ini",				"temp/phonebooktest/general/testframework/testframework_pbkfetch.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcbctestpbkfetch.cfg",						"temp/phonebooktest/general/testframework/tcbctestpbkfetch.cfg") or die "failed : $!";
+
 copy($epoc . "release/winscw/udeb/bctestpbkuiutil.dll",							"temp/phonebooktest/winscw_udeb/bctestpbkuiutil.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_pbkuiutil.ini",				"temp/phonebooktest/general/testframework/testframework_pbkuiutil.ini") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcbctestpbkuiutil.cfg",					"temp/phonebooktest/general/testframework/tcbctestpbkuiutil.cfg") or die "failed : $!";
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/contacts/phonebook/phonebook.xml
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -15,7 +15,7 @@
 			<device rank="master" alias="emulator_udeb"/>
 		</target>
 		<session id="" name="Contacts Phonebook Binary Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
-			<set id="" name="Phonebook Add/Edit UI" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="Phonebook Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
 				<case id="" name="Phonebook Add/Edit" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -65,7 +65,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\testframework\tcbctestpbkdataaddedit.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
+                            <param timeout="900"/>
 						</params>
 					</step>
 					<step id="" name="bctestpbkdataaddedit (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -75,9 +75,7 @@
 						</params>
 					</step>
 				</case>
-			</set>
-			<set id="" name="Phonebook Data Management" harness="ATSINTERFACE" enabled="true" passrate="100">
-                <case id="" name="Phonebook View Resource Manager" harness="ATSINTERFACE" enabled="true" passrate="100">
+                <case id="" name="Phonebook Data Management" 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>
@@ -93,24 +91,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkvrsc.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkvrsc.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkvrsc.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkvrsc.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkvrsc.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkvrsc.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -120,29 +100,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtrpbkviewresourcefile (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkvrsc.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtrpbkviewresourcefile (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="Phonebook Idle Finder" 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="mtpbkidlefinder.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -152,24 +109,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkifinder.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkifinder.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkifinder.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkifinder.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkifinder.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkifinder.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -179,29 +118,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkidlefinder (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkifinder.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkidlefinder (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="Phonebook Icon Info" 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="mtpbkiconinfo.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -211,24 +127,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkinfo.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkinfo.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkinfo.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkinfo.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -238,29 +136,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkiconinfo (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkinfo.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkiconinfo (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="Phonebook Icon ID" 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="mtpbkiconid.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -270,24 +145,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkicon.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkicon.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkicon.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkicon.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkicon.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkicon.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -297,29 +154,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkiconid (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkicon.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkiconid (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="Phonebook Fields" 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="mtpbkfields.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -329,24 +163,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkfeilds.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkfeilds.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkfeilds.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkfeilds.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkfeilds.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkfeilds.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -356,29 +172,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfields (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkfeilds.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfields (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="Phonebook Field Data" 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="mtpbkfielddata.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -388,24 +181,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkfdata.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkfdata.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkfdata.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkfdata.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkfdata.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkfdata.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -415,29 +190,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfielddata (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkfdata.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfielddata (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="Phonebook Contact Iteration" 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="mtpbkcontactiter.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -447,24 +199,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkiter.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkiter.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkiter.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkiter.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkiter.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkiter.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -474,29 +208,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactiter (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkiter.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactiter (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="Phonebook Contact Item Field" 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="mtpbkcontactitemfield.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -506,24 +217,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkcif.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkcif.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkcif.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkcif.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkcif.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkcif.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -533,29 +226,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactitemfield (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkcif.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactitemfield (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="Phonebook Contact Engine" 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="mtpbkcontactengine.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -565,24 +235,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_cengine.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_cengine.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestcengine.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestcengine.cfg"/>
-							<param dst="c:\testframework\tcbctestcengine.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestcengine.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -592,29 +244,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactengine (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\testframework\tcbctestcengine.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactengine (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="Phonebook Fields Info" 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="mtpbkfieldsinfo.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -624,24 +253,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkfinfo.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkfinfo.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkfinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkfinfo.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkfinfo.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkfinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -651,29 +262,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfieldsinfo (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkfinfo.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfieldsinfo (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="Phonebook Contact Item" 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="mtpbkcontactitem.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -683,24 +271,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkcitem.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbkcitem.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkcitem.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbkcitem.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkcitem.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkcitem.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -710,29 +280,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactitem (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkcitem.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkcontactitem (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="Phonebook Notifier" 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="mtpbkcontactchangenotifier.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -742,24 +289,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbknotifier.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_pbknotifier.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbknotifier.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/tcbctestpbknotifier.cfg"/>
-							<param dst="c:\testframework\tcbctestpbknotifier.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkpbknotifier.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -769,25 +298,41 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactchangenotifier (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					<step id="" name="testframework_pbkdmngt.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_pbkdmngt.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="tcbctestpbkdatamngt.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tcbctestpbkdatamngt.cfg"/>
+							<param dst="c:\testframework\tcbctestpbkdatamngt.cfg"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					<step id="" name="testpbkdatamngt (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbknotifier.cfg"/>
+							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkdatamngt.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="1800"/>
 						</params>
 					</step>
-					<step id="" name="mtpbkcontactchangenotifier (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					<step id="" name="testpbkdatamngt (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>fetch-log</command>
 						<params>
 							<param path="c:\logs\testframework\TestReport.txt" /> 
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook Fetch UI" harness="ATSINTERFACE" enabled="true" passrate="100">
-                <case id="" name="Phonebook SMS Address Select" harness="ATSINTERFACE" enabled="true" passrate="100">
+                <case id="" name="Phonebook Fetch UI" 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>
@@ -803,24 +348,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_smsaddsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_smsaddsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsmsaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestsmsaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestsmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -830,29 +357,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbksmsaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsmsaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbksmsaddressselect (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="Phonebook Single Entry Fetch Dlg" 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="mtpbksingleentryfetchdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -862,24 +366,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_sefielddlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_sefielddlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsefielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsefielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestsefielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestsefielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -889,29 +375,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbksingleentryfetchdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsefielddlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbksingleentryfetchdlg (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="Phonebook POC Address Select" 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="mtpbkpocaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -921,24 +384,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pocadd.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_pocadd.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsefielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsefielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestsefielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpocadd.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -948,29 +393,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkpocaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsefielddlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkpocaddressselect (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="Phonebook Phone Number Select" 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="mtpbkphonenumberselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -980,24 +402,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_phonenumber.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_phonenumber.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestphonenumber.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestphonenumber.cfg"/>
-							<param dst="c:\testframework\tcbctestphonenumber.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestphonenumber.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1007,29 +411,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkphonenumberselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestphonenumber.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkphonenumberselect (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="Phonebook Multiple Entry Fetch Dlg" 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="mtpbkmultipleentryfetchdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1039,15 +420,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fetchdlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fetchdlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfetchdlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1066,29 +438,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkmultipleentryfetchdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\ui_bctestfetchdlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkmultipleentryfetchdlg (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="Phonebook MMS Address Select" 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="mtpbkmmsaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1098,24 +447,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_mmsaddsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_mmsaddsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestmmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestmmsaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestmmsaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestmmsaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1125,29 +456,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkmmsaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestmmsaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkmmsaddressselect (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="Phonebook Add Item Dlg" 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="mtpbkmemoryentryadditemdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1157,24 +465,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkadditemdlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_pbkadditemdlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkadditemdlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestpbkadditemdlg.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkadditemdlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkadditemdlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1184,29 +474,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkmemoryentryadditemdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkadditemdlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkmemoryentryadditemdlg (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="Phonebook Fetch Selection" 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="mtpbkfetchdlgselection.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1216,24 +483,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fetchsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fetchsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestfetchsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestfetchsel.cfg"/>
-							<param dst="c:\testframework\tcbctestfetchsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfetchsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1243,29 +492,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfetchdlgselection (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestfetchsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfetchdlgselection (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="Phonebook Fetch Callbacks" 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="mtpbkfetchcallbacks.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1275,24 +501,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fcallback.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fcallback.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestfcallback.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestfcallback.cfg"/>
-							<param dst="c:\testframework\tcbctestfcallback.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfcallback.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1302,29 +510,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkfetchcallbacks (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestfcallback.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkfetchcallbacks (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="Phonebook Email Over SMS" 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="mtpbkemailoversms.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1334,24 +519,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_emailoversms.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_emailoversms.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestemaioversms.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestemaioversms.cfg"/>
-							<param dst="c:\testframework\tcbctestemaioversms.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestemaioversms.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1361,29 +528,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkemailoversms (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestemaioversms.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkemailoversms (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="Phonebook Email Address Select" 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="mtpbkemailaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1393,24 +537,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_addemailsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_addemailsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestemailaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestemailaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestemailaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestemailaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1420,29 +546,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkemailaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestemailaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkemailaddressselect (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="Phonebook Address Select" 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="mtpbkaddressselect.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1452,24 +555,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_pbkaddsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_pbkaddsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestpbkaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestpbkaddsel.cfg"/>
-							<param dst="c:\testframework\tcbctestpbkaddsel.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestpbkaddsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1482,35 +567,12 @@
 					<step id="" name="pbkaddressselect.rsc (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/pbkaddressselect.rsc"/>
-							<param dst="z:\resource\plugins\pbkaddressselect.rsc"/>
+							<param type="data"/>
+							<param src="resource\pbkaddressselect.rsc"/>
+							<param dst="C:\resource\pbkaddressselect.rsc"/>
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkaddressselect (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkaddsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkaddressselect (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="Phonebook Phone Number Select" 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="mtpbkphonenumberselectbase.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1520,15 +582,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_numsel.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_numsel.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="tcbctestnumsel.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1551,34 +604,11 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/plugins/mt_cpbkphonenumberselectbase.rsc"/>
-							<param dst="z:\resource\plugins\mt_cpbkphonenumberselectbase.rsc"/>
+							<param src="z\resource\mt_cpbkphonenumberselectbase.rsc"/>
+							<param dst="z:\resource\mt_cpbkphonenumberselectbase.rsc"/>
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkphonenumberselectbase (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestnumsel.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkphonenumberselectbase (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="Phonebook Select Field Dlg" 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="mtpbkselectfielddlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1588,24 +618,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_fielddlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_fielddlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestfielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestfielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestfielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestfielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1615,29 +627,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbkselectfielddlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestfielddlg.cfg"/>
-                            <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
-						</params>
-					</step>
-					<step id="" name="mtpbkselectfielddlg (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="Phonebook Single Item Select Dlg" 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="mtpbksingleitemfetchdlg.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1647,24 +636,6 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="testframework_sifielddlg.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\testframework_sifielddlg.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
-					<step id="" name="tcbctestsifielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework\tcbctestsifielddlg.cfg"/>
-							<param dst="c:\testframework\tcbctestsifielddlg.cfg"/>
-							<param component-path="phonebooktest" />
-						</params>
-					</step>
 					<step id="" name="ui_bctestsifielddlg.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1674,24 +645,43 @@
 							<param component-path="phonebooktest" />
 						</params>
 					</step>
-					<step id="" name="mtpbksingleitemfetchdlg (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					
+					<step id="" name="testframework_pbkfetch.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\testframework_pbkfetch.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					
+					<step id="" name="tcbctestpbkfetch.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\tcbctestpbkfetch.cfg"/>
+							<param dst="c:\testframework\tcbctestpbkfetch.cfg"/>
+							<param component-path="phonebooktest" />
+						</params>
+					</step>
+					
+					<step id="" name="testpbkfetch (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestsifielddlg.cfg"/>
+							<param parameters="-testmodule testcombiner -config c:\testframework\tcbctestpbkfetch.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="1800"/>
 						</params>
 					</step>
-					<step id="" name="mtpbksingleitemfetchdlg (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+					<step id="" name="testpbkfetch (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>fetch-log</command>
 						<params>
 							<param path="c:\logs\testframework\TestReport.txt" /> 
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook UI Utilities" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <case id="" name="Phonebook UI Utilities" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -1741,7 +731,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkuiutil.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="1800"/>
 						</params>
 					</step>
 					<step id="" name="bctestpbkuiutil (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -1751,8 +741,6 @@
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook VCard Import Export" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <case id="" name="Phonebook VCard Import Export" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -1883,7 +871,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkvcardimportexport.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="900"/>
 						</params>
 					</step>
 					<step id="" name="bctestpbkvcardimportexport (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -1893,8 +881,6 @@
 						</params>
 					</step>                
                 </case>
-            </set>
-            <set id="" name="Phonebook Speed Dial" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <case id="" name="Phonebook Speed Dial" harness="ATSINTERFACE" enabled="true" passrate="100">
                     <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
                         <command>makedir</command>
@@ -1944,7 +930,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcspeeddial.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="300"/>
+                            <param timeout="900"/>
 						</params>
 					</step>
 					<step id="" name="bctestspeeddial (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -1964,64 +950,43 @@
         <file>phonebooktest/general/testframework/ui_bctestpbkdataaddedit.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtrpbkviewresourcefile.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkvrsc.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkvrsc.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkvrsc.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkidlefinder.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkifinder.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkifinder.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkifinder.cfg</file>
 
 		<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_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_bctestpbkicon.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkfields.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkfeilds.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkfeilds.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkfeilds.cfg</file>
 
 		<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_bctestpbkfdata.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactiter.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkiter.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkiter.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkiter.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactitemfield.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkcif.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkcif.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkcif.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactengine.dll</file>
-		<file>phonebooktest/general/testframework/testframework_cengine.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestcengine.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestcengine.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkfieldsinfo.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkfinfo.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkfinfo.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkfinfo.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactitem.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbkcitem.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbkcitem.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkcitem.cfg</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkcontactchangenotifier.dll</file>
-		<file>phonebooktest/general/testframework/testframework_pbknotifier.ini</file>
-        <file>phonebooktest/general/testframework/tcbctestpbknotifier.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkpbknotifier.cfg</file>
+		
+		<file>phonebooktest/general/testframework/testframework_pbkdmngt.ini</file>
+        <file>phonebooktest/general/testframework/tcbctestpbkdatamngt.cfg</file>		
 
 		<file>phonebooktest/winscw_udeb/mtpbksmsaddressselect.dll</file>
 		<file>phonebooktest/general/testframework/testframework_smsaddsel.ini</file>
@@ -2082,13 +1047,13 @@
 		<file>phonebooktest/general/testframework/testframework_pbkaddsel.ini</file>
         <file>phonebooktest/general/testframework/tcbctestpbkaddsel.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestpbkaddsel.cfg</file>
-		<file>phonebooktest/winscw_udeb/z/resource/plugins/pbkaddressselect.rsc</file>
+		<file>phonebooktest/general/resource/pbkaddressselect.rsc</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkphonenumberselectbase.dll</file>
 		<file>phonebooktest/general/testframework/testframework_numsel.ini</file>
         <file>phonebooktest/general/testframework/tcbctestnumsel.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestnumsel.cfg</file>
-		<file>phonebooktest/winscw_udeb/z/resource/plugins/mt_cpbkphonenumberselectbase.rsc</file>
+		<file>phonebooktest/winscw_udeb/z/resource/mt_cpbkphonenumberselectbase.rsc</file>
 
 		<file>phonebooktest/winscw_udeb/mtpbkselectfielddlg.dll</file>
 		<file>phonebooktest/general/testframework/testframework_fielddlg.ini</file>
@@ -2100,6 +1065,9 @@
         <file>phonebooktest/general/testframework/tcbctestsifielddlg.cfg</file>
         <file>phonebooktest/general/testframework/ui_bctestsifielddlg.cfg</file>
 
+		<file>phonebooktest/general/testframework/testframework_pbkfetch.ini</file>
+		<file>phonebooktest/general/testframework/tcbctestpbkfetch.cfg</file>
+		
 		<file>phonebooktest/winscw_udeb/bctestpbkuiutil.dll</file>
 		<file>phonebooktest/general/testframework/testframework_pbkuiutil.ini</file>
 		<file>phonebooktest/general/testframework/tcbctestpbkuiutil.cfg</file>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/glib/glib.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/glib/glib.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,132 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for GTK Library BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "glibtest.zip";
+rmtree "temp";
+mkpath "temp/glibtest/glib/general";
+mkpath "temp/glibtest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("glib.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/accumulator.exe",		"temp/glibtest/winscw_udeb/accumulator.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/array-test.exe",		"temp/glibtest/winscw_udeb/array-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/asyncqueue-test.exe",	"temp/glibtest/winscw_udeb/asyncqueue-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/atomic-test.exe",		"temp/glibtest/winscw_udeb/atomic-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/child-test1.exe",		"temp/glibtest/winscw_udeb/child-test1.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/child-test2.exe",		"temp/glibtest/winscw_udeb/child-test2.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/closure-marshal.exe",	"temp/glibtest/winscw_udeb/closure-marshal.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/closures.exe",		"temp/glibtest/winscw_udeb/closures.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/completion-test.exe",	"temp/glibtest/winscw_udeb/completion-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/convert-test.exe",	"temp/glibtest/winscw_udeb/convert-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/date-test.exe",		"temp/glibtest/winscw_udeb/date-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/defaultiface.exe",	"temp/glibtest/winscw_udeb/defaultiface.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/dirname-test.exe",	"temp/glibtest/winscw_udeb/dirname-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/env-test.exe",		"temp/glibtest/winscw_udeb/env-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/error_check_mutexes.exe",	"temp/glibtest/winscw_udeb/error_check_mutexes.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/extra_tests.exe",		"temp/glibtest/winscw_udeb/extra_tests.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/file-test.exe",		"temp/glibtest/winscw_udeb/file-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/gio-test.exe",		"temp/glibtest/winscw_udeb/gio-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/gvalue-test.exe",		"temp/glibtest/winscw_udeb/gvalue-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/g_test1.exe",			"temp/glibtest/winscw_udeb/g_test1.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/g_test2.exe",			"temp/glibtest/winscw_udeb/g_test2.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/hash-test.exe",		"temp/glibtest/winscw_udeb/hash-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/ifacecheck.exe",		"temp/glibtest/winscw_udeb/ifacecheck.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/ifaceinherit.exe",	"temp/glibtest/winscw_udeb/ifaceinherit.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/ifaceinit.exe",		"temp/glibtest/winscw_udeb/ifaceinit.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/ifaceproperties.exe",	"temp/glibtest/winscw_udeb/ifaceproperties.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/iochannel-test.exe",	"temp/glibtest/winscw_udeb/iochannel-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/keyfile-test.exe",	"temp/glibtest/winscw_udeb/keyfile-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/list-test.exe",		"temp/glibtest/winscw_udeb/list-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/mainloop-test.exe",	"temp/glibtest/winscw_udeb/mainloop-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/mapping-test.exe",	"temp/glibtest/winscw_udeb/mapping-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/markup-escape-test.exe",	"temp/glibtest/winscw_udeb/markup-escape-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/markup-test.exe",		"temp/glibtest/winscw_udeb/markup-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/module-test.exe",		"temp/glibtest/winscw_udeb/module-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/node-test.exe",		"temp/glibtest/winscw_udeb/node-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/objects.exe",			"temp/glibtest/winscw_udeb/objects.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/objects2.exe",		"temp/glibtest/winscw_udeb/objects2.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/option-test.exe",		"temp/glibtest/winscw_udeb/option-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/override.exe",		"temp/glibtest/winscw_udeb/override.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/paramspec-test.exe",	"temp/glibtest/winscw_udeb/paramspec-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/patterntest.exe",		"temp/glibtest/winscw_udeb/patterntest.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/printf-test.exe",		"temp/glibtest/winscw_udeb/printf-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/properties.exe",		"temp/glibtest/winscw_udeb/properties.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/properties2.exe",		"temp/glibtest/winscw_udeb/properties2.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/qsort-test.exe",		"temp/glibtest/winscw_udeb/qsort-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/queue-test.exe",		"temp/glibtest/winscw_udeb/queue-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/rand-test.exe",		"temp/glibtest/winscw_udeb/rand-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/references.exe",		"temp/glibtest/winscw_udeb/references.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/relation-test.exe",	"temp/glibtest/winscw_udeb/relation-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/shell-test.exe",		"temp/glibtest/winscw_udeb/shell-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/signals-multithread.exe",	"temp/glibtest/winscw_udeb/signals-multithread.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/signals-singlethread.exe",	"temp/glibtest/winscw_udeb/signals-singlethread.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/slist-test.exe",		"temp/glibtest/winscw_udeb/slist-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/strfunc-test.exe",	"temp/glibtest/winscw_udeb/strfunc-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/string-test.exe",		"temp/glibtest/winscw_udeb/string-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/strtod-test.exe",		"temp/glibtest/winscw_udeb/strtod-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tasyncqueue.exe",		"temp/glibtest/winscw_udeb/tasyncqueue.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/testgdate.exe",		"temp/glibtest/winscw_udeb/testgdate.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/testgdateparser.exe",	"temp/glibtest/winscw_udeb/testgdateparser.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/testglib.exe",		"temp/glibtest/winscw_udeb/testglib.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/testgobject.exe",		"temp/glibtest/winscw_udeb/testgobject.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tgstring.exe",		"temp/glibtest/winscw_udeb/tgstring.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/thread-test.exe",		"temp/glibtest/winscw_udeb/thread-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/threadpool-test.exe",	"temp/glibtest/winscw_udeb/threadpool-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/timeloop-closure.exe",	"temp/glibtest/winscw_udeb/timeloop-closure.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/timeloop.exe",		"temp/glibtest/winscw_udeb/timeloop.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tmanual.exe",		"temp/glibtest/winscw_udeb/tmanual.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tmisc.exe",			"temp/glibtest/winscw_udeb/tmisc.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tnode.exe",			"temp/glibtest/winscw_udeb/tnode.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/toption.exe",			"temp/glibtest/winscw_udeb/toption.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tree-test.exe",		"temp/glibtest/winscw_udeb/tree-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tscanner.exe",		"temp/glibtest/winscw_udeb/tscanner.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tslist.exe",			"temp/glibtest/winscw_udeb/tslist.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tthread.exe",			"temp/glibtest/winscw_udeb/tthread.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/ttrash.exe",			"temp/glibtest/winscw_udeb/ttrash.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/ttree.exe",			"temp/glibtest/winscw_udeb/ttree.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tunichar.exe",		"temp/glibtest/winscw_udeb/tunichar.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tutf8.exe",			"temp/glibtest/winscw_udeb/tutf8.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/typetest.exe",		"temp/glibtest/winscw_udeb/typetest.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/unichar_test.exe",	"temp/glibtest/winscw_udeb/unichar_test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/unicode-caseconv.exe",	"temp/glibtest/winscw_udeb/unicode-caseconv.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/unicode-collate.exe",	"temp/glibtest/winscw_udeb/unicode-collate.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/unicode-encoding.exe",	"temp/glibtest/winscw_udeb/unicode-encoding.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/unicode-normalize.exe",	"temp/glibtest/winscw_udeb/unicode-normalize.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/uri-test.exe",		"temp/glibtest/winscw_udeb/uri-test.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/utf8-pointer.exe",	"temp/glibtest/winscw_udeb/utf8-pointer.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/utf8-validate.exe",	"temp/glibtest/winscw_udeb/utf8-validate.exe") or die "failed : $!";
+
+copy($epoc . "release/winscw/udeb/libmoduletestplugin_a.dll",	"temp/glibtest/winscw_udeb/libmoduletestplugin_a.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/libmoduletestplugin_b.dll",	"temp/glibtest/winscw_udeb/libmoduletestplugin_b.dll") or die "failed : $!";
+
+copy($epoc . "winscw/c/temp/tmp/test.txt",				"temp/glibtest/glib/general/test.txt") or die "failed : $!";			
+copy($epoc . "winscw/c/1.gmarkup",						"temp/glibtest/glib/general/1.gmarkup") or die "failed : $!";
+copy($epoc . "winscw/c/iochannel-test-infile",			"temp/glibtest/glib/general/iochannel-test-infile") or die "failed : $!";
+copy($epoc . "winscw/c/casemap.bin",					"temp/glibtest/glib/general/casemap.bin") or die "failed : $!";
+copy($epoc . "winscw/c/casefold.bin",					"temp/glibtest/glib/general/casefold.bin") or die "failed : $!";
+copy($epoc . "winscw/c/utf8.txt",						"temp/glibtest/glib/general/utf8.txt") or die "failed : $!";
+copy($epoc . "winscw/c/casecollate.txt",				"temp/glibtest/glib/general/casecollate.txt") or die "failed : $!";
+copy($epoc . "winscw/c/utf8_hindi.txt",					"temp/glibtest/glib/general/utf8_hindi.txt") or die "failed : $!";
+copy($epoc . "winscw/c/scanfile.txt",					"temp/glibtest/glib/general/scanfile.txt") or die "failed : $!";
+copy($epoc . "winscw/c/NormalizationTest.txt",			"temp/glibtest/glib/general/NormalizationTest.txt") or die "failed : $!";
+
+system("7z a -tzip glibtest.zip ./temp/*");
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/glib/glib.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/glib/glib.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,1615 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>GTK Library BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="GTK Library BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="GTK Library Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="GLib" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="GLib" 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="accumulator.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="accumulator.exe"/>
+							<param dst="c:\sys\bin\accumulator.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="array-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="array-test.exe"/>
+							<param dst="c:\sys\bin\array-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="asyncqueue-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="asyncqueue-test.exe"/>
+							<param dst="c:\sys\bin\asyncqueue-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="atomic-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="atomic-test.exe"/>
+							<param dst="c:\sys\bin\atomic-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="child-test1.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="child-test1.exe"/>
+							<param dst="c:\sys\bin\child-test1.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="child-test2.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="child-test2.exe"/>
+							<param dst="c:\sys\bin\child-test2.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="closure-marshal.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="closure-marshal.exe"/>
+							<param dst="c:\sys\bin\closure-marshal.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="closures.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="closures.exe"/>
+							<param dst="c:\sys\bin\closures.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="completion-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="completion-test.exe"/>
+							<param dst="c:\sys\bin\completion-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="convert-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="convert-test.exe"/>
+							<param dst="c:\sys\bin\convert-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="date-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="date-test.exe"/>
+							<param dst="c:\sys\bin\date-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="defaultiface.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="defaultiface.exe"/>
+							<param dst="c:\sys\bin\defaultiface.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="dirname-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="dirname-test.exe"/>
+							<param dst="c:\sys\bin\dirname-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="env-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="env-test.exe"/>
+							<param dst="c:\sys\bin\env-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="error_check_mutexes.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="error_check_mutexes.exe"/>
+							<param dst="c:\sys\bin\error_check_mutexes.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="extra_tests.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="extra_tests.exe"/>
+							<param dst="c:\sys\bin\extra_tests.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="file-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="file-test.exe"/>
+							<param dst="c:\sys\bin\file-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="gio-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="gio-test.exe"/>
+							<param dst="c:\sys\bin\gio-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="gvalue-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="gvalue-test.exe"/>
+							<param dst="c:\sys\bin\gvalue-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="g_test1.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="g_test1.exe"/>
+							<param dst="c:\sys\bin\g_test1.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="g_test2.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="g_test2.exe"/>
+							<param dst="c:\sys\bin\g_test2.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="hash-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="hash-test.exe"/>
+							<param dst="c:\sys\bin\hash-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="ifacecheck.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ifacecheck.exe"/>
+							<param dst="c:\sys\bin\ifacecheck.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="ifaceinherit.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ifaceinherit.exe"/>
+							<param dst="c:\sys\bin\ifaceinherit.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="ifaceinit.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ifaceinit.exe"/>
+							<param dst="c:\sys\bin\ifaceinit.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="ifaceproperties.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ifaceproperties.exe"/>
+							<param dst="c:\sys\bin\ifaceproperties.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="iochannel-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="iochannel-test.exe"/>
+							<param dst="c:\sys\bin\iochannel-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="keyfile-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="keyfile-test.exe"/>
+							<param dst="c:\sys\bin\keyfile-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="list-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="list-test.exe"/>
+							<param dst="c:\sys\bin\list-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="mainloop-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="mainloop-test.exe"/>
+							<param dst="c:\sys\bin\mainloop-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="mapping-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="mapping-test.exe"/>
+							<param dst="c:\sys\bin\mapping-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="markup-escape-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="markup-escape-test.exe"/>
+							<param dst="c:\sys\bin\markup-escape-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="markup-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="markup-test.exe"/>
+							<param dst="c:\sys\bin\markup-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="module-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="module-test.exe"/>
+							<param dst="c:\sys\bin\module-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="node-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="node-test.exe"/>
+							<param dst="c:\sys\bin\node-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="objects.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="objects.exe"/>
+							<param dst="c:\sys\bin\objects.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="objects2.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="objects2.exe"/>
+							<param dst="c:\sys\bin\objects2.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="option-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="option-test.exe"/>
+							<param dst="c:\sys\bin\option-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="override.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="override.exe"/>
+							<param dst="c:\sys\bin\override.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="paramspec-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="paramspec-test.exe"/>
+							<param dst="c:\sys\bin\paramspec-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="patterntest.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="patterntest.exe"/>
+							<param dst="c:\sys\bin\patterntest.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="printf-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="printf-test.exe"/>
+							<param dst="c:\sys\bin\printf-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="properties.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="properties.exe"/>
+							<param dst="c:\sys\bin\properties.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="properties2.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="properties2.exe"/>
+							<param dst="c:\sys\bin\properties2.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="qsort-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="qsort-test.exe"/>
+							<param dst="c:\sys\bin\qsort-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="queue-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="queue-test.exe"/>
+							<param dst="c:\sys\bin\queue-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="rand-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="rand-test.exe"/>
+							<param dst="c:\sys\bin\rand-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="references.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="references.exe"/>
+							<param dst="c:\sys\bin\references.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="relation-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="relation-test.exe"/>
+							<param dst="c:\sys\bin\relation-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="shell-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="shell-test.exe"/>
+							<param dst="c:\sys\bin\shell-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="signals-multithread.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="signals-multithread.exe"/>
+							<param dst="c:\sys\bin\signals-multithread.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="signals-singlethread.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="signals-singlethread.exe"/>
+							<param dst="c:\sys\bin\signals-singlethread.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="slist-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="slist-test.exe"/>
+							<param dst="c:\sys\bin\slist-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="strfunc-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="strfunc-test.exe"/>
+							<param dst="c:\sys\bin\strfunc-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="string-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="string-test.exe"/>
+							<param dst="c:\sys\bin\string-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="strtod-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="strtod-test.exe"/>
+							<param dst="c:\sys\bin\strtod-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tasyncqueue.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tasyncqueue.exe"/>
+							<param dst="c:\sys\bin\tasyncqueue.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="testgdate.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="testgdate.exe"/>
+							<param dst="c:\sys\bin\testgdate.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="testgdateparser.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="testgdateparser.exe"/>
+							<param dst="c:\sys\bin\testgdateparser.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="testglib.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="testglib.exe"/>
+							<param dst="c:\sys\bin\testglib.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="testgobject.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="testgobject.exe"/>
+							<param dst="c:\sys\bin\testgobject.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tgstring.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tgstring.exe"/>
+							<param dst="c:\sys\bin\tgstring.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="thread-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="thread-test.exe"/>
+							<param dst="c:\sys\bin\thread-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="threadpool-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="threadpool-test.exe"/>
+							<param dst="c:\sys\bin\threadpool-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="timeloop-closure.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="timeloop-closure.exe"/>
+							<param dst="c:\sys\bin\timeloop-closure.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="timeloop.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="timeloop.exe"/>
+							<param dst="c:\sys\bin\timeloop.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="tmanual.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tmanual.exe"/>
+							<param dst="c:\sys\bin\tmanual.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tmisc.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tmisc.exe"/>
+							<param dst="c:\sys\bin\tmisc.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tnode.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tnode.exe"/>
+							<param dst="c:\sys\bin\tnode.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="toption.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="toption.exe"/>
+							<param dst="c:\sys\bin\toption.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="tree-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tree-test.exe"/>
+							<param dst="c:\sys\bin\tree-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tscanner.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tscanner.exe"/>
+							<param dst="c:\sys\bin\tscanner.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tslist.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tslist.exe"/>
+							<param dst="c:\sys\bin\tslist.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tthread.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tthread.exe"/>
+							<param dst="c:\sys\bin\tthread.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="ttrash.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ttrash.exe"/>
+							<param dst="c:\sys\bin\ttrash.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="ttree.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ttree.exe"/>
+							<param dst="c:\sys\bin\ttree.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tunichar.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tunichar.exe"/>
+							<param dst="c:\sys\bin\tunichar.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="tutf8.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tutf8.exe"/>
+							<param dst="c:\sys\bin\tutf8.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="typetest.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="typetest.exe"/>
+							<param dst="c:\sys\bin\typetest.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="unichar_test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="unichar_test.exe"/>
+							<param dst="c:\sys\bin\unichar_test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+					<step id="" name="unicode-caseconv.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="unicode-caseconv.exe"/>
+							<param dst="c:\sys\bin\unicode-caseconv.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="unicode-collate.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="unicode-collate.exe"/>
+							<param dst="c:\sys\bin\unicode-collate.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="unicode-encoding.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="unicode-encoding.exe"/>
+							<param dst="c:\sys\bin\unicode-encoding.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="unicode-normalize.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="unicode-normalize.exe"/>
+							<param dst="c:\sys\bin\unicode-normalize.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="uri-test.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="uri-test.exe"/>
+							<param dst="c:\sys\bin\uri-test.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="utf8-pointer.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="utf8-pointer.exe"/>
+							<param dst="c:\sys\bin\utf8-pointer.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="utf8-validate.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="utf8-validate.exe"/>
+							<param dst="c:\sys\bin\utf8-validate.exe"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="libmoduletestplugin_a.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="libmoduletestplugin_a.dll"/>
+							<param dst="c:\sys\bin\libmoduletestplugin_a.dll"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+                    <step id="" name="libmoduletestplugin_b.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="libmoduletestplugin_b.dll"/>
+							<param dst="c:\sys\bin\libmoduletestplugin_b.dll"/>
+							<param component-path="glibtest" />
+						</params>
+					</step>
+
+					<step id="" name="test.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="test.txt"/>
+							<param dst="c:\temp\tmp\test.txt"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="1.gmarkup (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="1.gmarkup"/>
+							<param dst="c:\1.gmarkup"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="iochannel-test-infile (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="iochannel-test-infile"/>
+							<param dst="c:\iochannel-test-infile"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>					
+					<step id="" name="casemap.bin (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="casemap.bin"/>
+							<param dst="c:\casemap.bin"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="casefold.bin (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="casefold.bin"/>
+							<param dst="c:\casefold.bin"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="utf8.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="utf8.txt"/>
+							<param dst="c:\utf8.txt"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="casecollate.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="casecollate.txt"/>
+							<param dst="c:\casecollate.txt"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="utf8_hindi.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="utf8_hindi.txt"/>
+							<param dst="c:\utf8_hindi.txt"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="scanfile.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="scanfile.txt"/>
+							<param dst="c:\scanfile.txt"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="NormalizationTest.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="NormalizationTest.txt"/>
+							<param dst="c:\NormalizationTest.txt"/>
+							<param component-path="glibtest\glib" />
+						</params>
+					</step>
+					<step id="" name="accumulator (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="accumulator.exe"/>
+							<param result-file="c:\spd_logs\xml\accumulator.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="array-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="array-test.exe"/>
+							<param result-file="c:\spd_logs\xml\array-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="asyncqueue-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="asyncqueue-test.exe"/>
+							<param result-file="c:\spd_logs\xml\asyncqueue-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="atomic-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atomic-test.exe"/>
+							<param result-file="c:\spd_logs\xml\atomic-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="closure-marshal (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="closure-marshal.exe"/>
+							<param result-file="c:\spd_logs\xml\closure-marshal.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="closures (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="closures.exe"/>
+							<param result-file="c:\spd_logs\xml\closures.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="completion-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="completion-test.exe"/>
+							<param result-file="c:\spd_logs\xml\completion-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="convert-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="convert-test.exe"/>
+							<param result-file="c:\spd_logs\xml\convert-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="date-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="date-test.exe"/>
+							<param result-file="c:\spd_logs\xml\date-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="defaultiface (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="defaultiface.exe"/>
+							<param result-file="c:\spd_logs\xml\defaultiface.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="dirname-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="dirname-test.exe"/>
+							<param result-file="c:\spd_logs\xml\dirname-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="env-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="env-test.exe"/>
+							<param result-file="c:\spd_logs\xml\env-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="extra_tests (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="extra_tests.exe"/>
+							<param result-file="c:\spd_logs\xml\extra_tests.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="gio-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="gio-test.exe"/>
+							<param result-file="c:\spd_logs\xml\gio-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="gvalue-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="gvalue-test.exe"/>
+							<param result-file="c:\spd_logs\xml\gvalue-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="g_test1 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="g_test1.exe"/>
+							<param result-file="c:\spd_logs\xml\g_test1.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="g_test2 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="g_test2.exe"/>
+							<param result-file="c:\spd_logs\xml\g_test2.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="hash-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="hash-test.exe"/>
+							<param result-file="c:\spd_logs\xml\hash-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="ifacecheck (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ifacecheck.exe"/>
+							<param result-file="c:\spd_logs\xml\ifacecheck.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="ifaceinherit (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ifaceinherit.exe"/>
+							<param result-file="c:\spd_logs\xml\ifaceinherit.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="ifaceinit (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ifaceinit.exe"/>
+							<param result-file="c:\spd_logs\xml\ifaceinit.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="ifaceproperties (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ifaceproperties.exe"/>
+							<param result-file="c:\spd_logs\xml\ifaceproperties.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="iochannel-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="iochannel-test.exe"/>
+							<param result-file="c:\spd_logs\xml\iochannel-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="keyfile-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="keyfile-test.exe"/>
+							<param result-file="c:\spd_logs\xml\keyfile-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="list-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="list-test.exe"/>
+							<param result-file="c:\spd_logs\xml\list-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="mainloop-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="mainloop-test.exe"/>
+							<param result-file="c:\spd_logs\xml\mainloop-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="markup-escape-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="markup-escape-test.exe"/>
+							<param result-file="c:\spd_logs\xml\markup-escape-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="markup-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="markup-test.exe"/>
+							<param result-file="c:\spd_logs\xml\markup-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="module-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="module-test.exe"/>
+							<param result-file="c:\spd_logs\xml\module-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="node-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="node-test.exe"/>
+							<param result-file="c:\spd_logs\xml\node-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="objects (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="objects.exe"/>
+							<param result-file="c:\spd_logs\xml\objects.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="objects2 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="objects2.exe"/>
+							<param result-file="c:\spd_logs\xml\objects2.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="option-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="option-test.exe"/>
+							<param result-file="c:\spd_logs\xml\option-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="override (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="override.exe"/>
+							<param result-file="c:\spd_logs\xml\override.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="paramspec-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="paramspec-test.exe"/>
+							<param result-file="c:\spd_logs\xml\paramspec-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="patterntest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="patterntest.exe"/>
+							<param result-file="c:\spd_logs\xml\patterntest.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="properties (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="properties.exe"/>
+							<param result-file="c:\spd_logs\xml\properties.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="properties2 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="properties2.exe"/>
+							<param result-file="c:\spd_logs\xml\properties2.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="qsort-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="qsort-test.exe"/>
+							<param result-file="c:\spd_logs\xml\qsort-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="queue-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="queue-test.exe"/>
+							<param result-file="c:\spd_logs\xml\queue-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="rand-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="rand-test.exe"/>
+							<param result-file="c:\spd_logs\xml\rand-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="references (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="references.exe"/>
+							<param result-file="c:\spd_logs\xml\references.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="relation-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="relation-test.exe"/>
+							<param result-file="c:\spd_logs\xml\relation-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="shell-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="shell-test.exe"/>
+							<param result-file="c:\spd_logs\xml\shell-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="signals-multithread (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="signals-multithread.exe"/>
+							<param result-file="c:\spd_logs\xml\signals-multithread.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="signals-singlethread (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="signals-singlethread.exe"/>
+							<param result-file="c:\spd_logs\xml\signals-singlethread.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="slist-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="slist-test.exe"/>
+							<param result-file="c:\spd_logs\xml\slist-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="strfunc-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="strfunc-test.exe"/>
+							<param result-file="c:\spd_logs\xml\strfunc-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="string-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="string-test.exe"/>
+							<param result-file="c:\spd_logs\xml\string-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tasyncqueue (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tasyncqueue.exe"/>
+							<param result-file="c:\spd_logs\xml\tasyncqueue.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="testgdate (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="testgdate.exe"/>
+							<param result-file="c:\spd_logs\xml\testgdate.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="testgdateparser (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="testgdateparser.exe"/>
+							<param result-file="c:\spd_logs\xml\testgdateparser.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="testgobject (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="testgobject.exe"/>
+							<param result-file="c:\spd_logs\xml\testgobject.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="thread-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="thread-test.exe"/>
+							<param result-file="c:\spd_logs\xml\thread-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="threadpool-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="threadpool-test.exe"/>
+							<param result-file="c:\spd_logs\xml\threadpool-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="timeloop-closure (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="timeloop-closure.exe"/>
+							<param result-file="c:\spd_logs\xml\timeloop-closure.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="timeloop (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="timeloop.exe"/>
+							<param result-file="c:\spd_logs\xml\timeloop.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tmisc (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tmisc.exe"/>
+							<param result-file="c:\spd_logs\xml\tmisc.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tnode (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tnode.exe"/>
+							<param result-file="c:\spd_logs\xml\tnode.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="toption (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="toption.exe"/>
+							<param result-file="c:\spd_logs\xml\toption.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tscanner (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tscanner.exe"/>
+							<param result-file="c:\spd_logs\xml\tscanner.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tslist (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tslist.exe"/>
+							<param result-file="c:\spd_logs\xml\tslist.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tthread (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tthread.exe"/>
+							<param result-file="c:\spd_logs\xml\tthread.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="ttrash (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ttrash.exe"/>
+							<param result-file="c:\spd_logs\xml\ttrash.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="ttree (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ttree.exe"/>
+							<param result-file="c:\spd_logs\xml\ttree.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tunichar (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tunichar.exe"/>
+							<param result-file="c:\spd_logs\xml\tunichar.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tutf8 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="tutf8.exe"/>
+							<param result-file="c:\spd_logs\xml\tutf8.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="unichar_test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="unichar_test.exe"/>
+							<param result-file="c:\spd_logs\xml\unichar_test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="unicode-collate (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="unicode-collate.exe"/>
+							<param result-file="c:\spd_logs\xml\unicode-collate.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="unicode-encoding (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="unicode-encoding.exe"/>
+							<param result-file="c:\spd_logs\xml\unicode-encoding.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="unicode-normalize (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="unicode-normalize.exe"/>
+							<param result-file="c:\spd_logs\xml\unicode-normalize.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="uri-test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="uri-test.exe"/>
+							<param result-file="c:\spd_logs\xml\uri-test.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="utf8-pointer (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="utf8-pointer.exe"/>
+							<param result-file="c:\spd_logs\xml\utf8-pointer.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="utf8-validate (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="utf8-validate.exe"/>
+							<param result-file="c:\spd_logs\xml\utf8-validate.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>glibtest/winscw_udeb/accumulator.exe</file>
+		<file>glibtest/winscw_udeb/array-test.exe</file>
+		<file>glibtest/winscw_udeb/asyncqueue-test.exe</file>
+		<file>glibtest/winscw_udeb/atomic-test.exe</file>
+		<file>glibtest/winscw_udeb/child-test1.exe</file>
+		<file>glibtest/winscw_udeb/child-test2.exe</file>
+		<file>glibtest/winscw_udeb/closure-marshal.exe</file>
+		<file>glibtest/winscw_udeb/closures.exe</file>
+		<file>glibtest/winscw_udeb/completion-test.exe</file>
+		<file>glibtest/winscw_udeb/convert-test.exe</file>
+		<file>glibtest/winscw_udeb/date-test.exe</file>
+		<file>glibtest/winscw_udeb/defaultiface.exe</file>
+		<file>glibtest/winscw_udeb/dirname-test.exe</file>
+		<file>glibtest/winscw_udeb/env-test.exe</file>
+		<file>glibtest/winscw_udeb/error_check_mutexes.exe</file>
+		<file>glibtest/winscw_udeb/extra_tests.exe</file>
+		<file>glibtest/winscw_udeb/file-test.exe</file>
+		<file>glibtest/winscw_udeb/gio-test.exe</file>
+		<file>glibtest/winscw_udeb/gvalue-test.exe</file>
+		<file>glibtest/winscw_udeb/g_test1.exe</file>
+		<file>glibtest/winscw_udeb/g_test2.exe</file>
+		<file>glibtest/winscw_udeb/hash-test.exe</file>
+		<file>glibtest/winscw_udeb/ifacecheck.exe</file>
+		<file>glibtest/winscw_udeb/ifaceinherit.exe</file>
+		<file>glibtest/winscw_udeb/ifaceinit.exe</file>
+		<file>glibtest/winscw_udeb/ifaceproperties.exe</file>
+		<file>glibtest/winscw_udeb/iochannel-test.exe</file>
+		<file>glibtest/winscw_udeb/keyfile-test.exe</file>
+		<file>glibtest/winscw_udeb/list-test.exe</file>
+		<file>glibtest/winscw_udeb/mainloop-test.exe</file>
+		<file>glibtest/winscw_udeb/mapping-test.exe</file>
+		<file>glibtest/winscw_udeb/markup-escape-test.exe</file>
+		<file>glibtest/winscw_udeb/markup-test.exe</file>
+		<file>glibtest/winscw_udeb/module-test.exe</file>
+		<file>glibtest/winscw_udeb/node-test.exe</file>
+		<file>glibtest/winscw_udeb/objects.exe</file>
+		<file>glibtest/winscw_udeb/objects2.exe</file>
+		<file>glibtest/winscw_udeb/option-test.exe</file>
+		<file>glibtest/winscw_udeb/override.exe</file>
+		<file>glibtest/winscw_udeb/paramspec-test.exe</file>
+		<file>glibtest/winscw_udeb/patterntest.exe</file>
+		<file>glibtest/winscw_udeb/printf-test.exe</file>
+		<file>glibtest/winscw_udeb/properties.exe</file>
+		<file>glibtest/winscw_udeb/properties2.exe</file>
+		<file>glibtest/winscw_udeb/qsort-test.exe</file>
+		<file>glibtest/winscw_udeb/queue-test.exe</file>
+		<file>glibtest/winscw_udeb/rand-test.exe</file>
+		<file>glibtest/winscw_udeb/references.exe</file>
+		<file>glibtest/winscw_udeb/relation-test.exe</file>
+		<file>glibtest/winscw_udeb/shell-test.exe</file>
+		<file>glibtest/winscw_udeb/signals-multithread.exe</file>
+		<file>glibtest/winscw_udeb/signals-singlethread.exe</file>
+		<file>glibtest/winscw_udeb/slist-test.exe</file>
+		<file>glibtest/winscw_udeb/strfunc-test.exe</file>
+		<file>glibtest/winscw_udeb/string-test.exe</file>
+		<file>glibtest/winscw_udeb/strtod-test.exe</file>
+		<file>glibtest/winscw_udeb/tasyncqueue.exe</file>
+		<file>glibtest/winscw_udeb/testgdate.exe</file>
+		<file>glibtest/winscw_udeb/testgdateparser.exe</file>
+		<file>glibtest/winscw_udeb/testglib.exe</file>
+		<file>glibtest/winscw_udeb/testgobject.exe</file>
+		<file>glibtest/winscw_udeb/tgstring.exe</file>
+		<file>glibtest/winscw_udeb/thread-test.exe</file>
+		<file>glibtest/winscw_udeb/threadpool-test.exe</file>
+		<file>glibtest/winscw_udeb/timeloop-closure.exe</file>
+		<file>glibtest/winscw_udeb/timeloop.exe</file>
+		<file>glibtest/winscw_udeb/tmanual.exe</file>
+		<file>glibtest/winscw_udeb/tmisc.exe</file>
+		<file>glibtest/winscw_udeb/tnode.exe</file>
+		<file>glibtest/winscw_udeb/toption.exe</file>
+		<file>glibtest/winscw_udeb/tree-test.exe</file>
+		<file>glibtest/winscw_udeb/tscanner.exe</file>
+		<file>glibtest/winscw_udeb/tslist.exe</file>
+		<file>glibtest/winscw_udeb/tthread.exe</file>
+		<file>glibtest/winscw_udeb/ttrash.exe</file>
+		<file>glibtest/winscw_udeb/ttree.exe</file>
+		<file>glibtest/winscw_udeb/tunichar.exe</file>
+		<file>glibtest/winscw_udeb/tutf8.exe</file>
+		<file>glibtest/winscw_udeb/typetest.exe</file>
+		<file>glibtest/winscw_udeb/unichar_test.exe</file>
+		<file>glibtest/winscw_udeb/unicode-caseconv.exe</file>
+		<file>glibtest/winscw_udeb/unicode-collate.exe</file>
+		<file>glibtest/winscw_udeb/unicode-encoding.exe</file>
+		<file>glibtest/winscw_udeb/unicode-normalize.exe</file>
+		<file>glibtest/winscw_udeb/uri-test.exe</file>
+		<file>glibtest/winscw_udeb/utf8-pointer.exe</file>
+		<file>glibtest/winscw_udeb/utf8-validate.exe</file>
+		<file>glibtest/winscw_udeb/libmoduletestplugin_a.dll</file>
+		<file>glibtest/winscw_udeb/libmoduletestplugin_b.dll</file>
+		<file>glibtest/glib/general/test.txt</file>
+		<file>glibtest/glib/general/1.gmarkup</file>
+		<file>glibtest/glib/general/iochannel-test-infile</file>
+		<file>glibtest/glib/general/casemap.bin</file>
+		<file>glibtest/glib/general/casefold.bin</file>
+		<file>glibtest/glib/general/utf8.txt</file>
+		<file>glibtest/glib/general/casecollate.txt</file>
+		<file>glibtest/glib/general/utf8_hindi.txt</file>
+		<file>glibtest/glib/general/scanfile.txt</file>
+		<file>glibtest/glib/general/NormalizationTest.txt</file>
+	</files>
+</test>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.pl
--- a/common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/lmdbmanagement/lmdbmanagement.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Database Management BC tests
+# Script to build ATS test drop for Landmarks Database Management BC tests
 
 
 use strict;
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.pl
--- a/common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/lmsearch/lmsearch.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Search BC tests
+# Script to build ATS test drop for Landmarks Search BC tests
 
 
 use strict;
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/locationsrv/locaddedit/locaddedit.pl
--- a/common/tools/ats/bctest/locationsrv/locaddedit/locaddedit.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locaddedit/locaddedit.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Application Editor BC tests
+# Script to build ATS test drop for Landmarks Application Editor BC tests
 
 
 use strict;
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl
--- a/common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Location Acquisition BC tests
+# Script to build ATS test drop for Location Acquisition BC tests
 
 
 use strict;
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/locationsrv/locblid/locblid.pl
--- a/common/tools/ats/bctest/locationsrv/locblid/locblid.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locblid/locblid.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop BLID Application Satellite Info BC tests
+# Script to build ATS test drop for BLID Application Satellite Info BC tests
 
 
 use strict;
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl
--- a/common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Item Id Db Combi Info BC tests
+# Script to build ATS test drop for Landmarks Item Id Db Combi Info BC tests
 
 
 use strict;
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/locationsrv/locsel/locsel.pl
--- a/common/tools/ats/bctest/locationsrv/locsel/locsel.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locsel/locsel.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Selector BC tests
+# Script to build ATS test drop for Landmarks Selector BC tests
 
 
 use strict;
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/multimedia/multimediatest.xml
--- a/common/tools/ats/bctest/multimedia/multimediatest.xml	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediatest.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -17,7 +17,7 @@
 		<session id="" name="MultimediaSVS" harness="GENERIC" enabled="true" passrate="100">
 			<set id="" name="ECAM" harness="GENERIC" enabled="true" passrate="100">
 				<case id="" name="T_Camera" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="t_camera.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -26,7 +26,7 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="ecamtestplugin.rsc (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -35,7 +35,7 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="ecamtestplugin.dll (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -44,7 +44,7 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
+					<step id="" name="102070CC.txt (install)" harness="GENERIC" enabled="true" passrate="100">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -53,7 +53,7 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
+					<step id="" name="t_multimedia.tcs (install)" harness="GENERIC" enabled="true" passrate="100">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -62,7 +62,16 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 2 (location)" harness="GENERIC" enabled="true" passrate="100">
+					<step id="" name="t_multimedia.ini (install)" harness="GENERIC" enabled="true" passrate="100">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="multimedia/t_multimedia.ini"/>
+							<param dst="c:\multimedia\t_multimedia.ini"/>
+							<param component-path="multimediatest" />
+						</params>
+					</step>
+					<step id="" name="t_multimedia_location.ini (install)" harness="GENERIC" enabled="true" passrate="100">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -71,7 +80,7 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
+					<step id="" name="mm-ecm-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -80,7 +89,7 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
+					<step id="" name="mm-ecm-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -89,7 +98,7 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 4 (execute)" harness="GENERIC" enabled="true" passrate="100">
+					<step id="" name="mm-ecm-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
 							<param file="testexecute.exe"/>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/package_definition.xml
--- a/common/tools/ats/bctest/package_definition.xml	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -3,20 +3,21 @@
 <!ENTITY codeline.oss.fcl						"//v800008/builds01/mercurial_development/oss/FCL" >
 <!ENTITY codeline.sfl.fcl						"//v800008/builds01/mercurial_development/sfl/FCL" >
 <!ENTITY codeline.sfl.mcl						"//v800008/builds01/Mercurial_master_prod/sfl/MCL" >
-<!ENTITY param.updatebranch						"RCL_1" >
+<!ENTITY param.updatebranch						"-r RCL_1" >
 <!ENTITY cmd.clone								"metacmd.py mcclone" >
 <!ENTITY cmd.copy								"metacmd.py mccopy" >
 <!ENTITY cmd.makedirs							"metacmd.py mcmakedirs" >
 <!ENTITY cmd.perl								"perl" >
 <!ENTITY cmd.sisbld								"makesis" >
 <!ENTITY cmd.unzip								"7z -y x" >
-<!ENTITY cmd.update								"hg update &param.updatebranch;" >
-<!ENTITY cmd.wget								"wget" >
+<!ENTITY cmd.update								"hg update -C" >
+<!ENTITY cmd.wget								"wget -N" >
 <!ENTITY dir.50_asp_connection					"sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/sis" >
 <!ENTITY dir.50_asp_hostconn					"sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/sis" >
 <!ENTITY dir.50_asp_newsoapclasses				"sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/sis" >
 <!ENTITY dir.50_Browser_DownloadMgr				"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/sis" >
 <!ENTITY dir.50_Browser_Favourites				"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/sis" >
+<!ENTITY dir.50_Loc_Blid						"sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_Api" >
 <!ENTITY dir.50_loc_landmarks					"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/sis" >
 <!ENTITY dir.50_loc_LmkDBMgmt					"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/sis" >
 <!ENTITY dir.50_loc_LmkSearch					"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/sis" >
@@ -153,165 +154,192 @@
 				<command cmd="&cmd.makedirs;	sf/os" />
 				<command cmd="&cmd.makedirs;	sftools/ana" />
 				<command cmd="&cmd.clone;		&codeline.oss.fcl;/interim/fbf/configs/default	interim/fbf/configs/default" />
-				<command cmd="&cmd.update;"		dir="interim/fbf/configs/default" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="interim/fbf/configs/default" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/app/contacts				sf/app/contacts" />
-				<command cmd="&cmd.update;"		dir="sf/app/contacts" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/app/contacts" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/app/messaging				sf/app/messaging" />
-				<command cmd="&cmd.update;"		dir="sf/app/messaging" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/app/messaging" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/app/location				sf/app/location" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/app/location" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/appinstall				sf/mw/appinstall" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/appinstall" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/appsupport				sf/mw/appsupport" />
-				<command cmd="&cmd.update;"		dir="sf/mw/appsupport" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/appsupport" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/classicui				sf/mw/classicui" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/classicui" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/drm					sf/mw/drm" />
-				<command cmd="&cmd.update;"		dir="sf/mw/drm" />
-				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/locationsrv			sf/mw/locationsrv" />
-				<command cmd="&cmd.update;"		dir="sf/mw/locationsrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/drm" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/locationsrv			sf/mw/locationsrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/locationsrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/messagingmw			sf/mw/messagingmw" />
-				<command cmd="&cmd.update;"		dir="sf/mw/messagingmw" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/messagingmw" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/mmmw					sf/mw/mmmw" />
-				<command cmd="&cmd.update;"		dir="sf/mw/mmmw" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/mmmw" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/websrv					sf/mw/websrv" />
-				<command cmd="&cmd.update;"		dir="sf/mw/websrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/websrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/os/devicesrv				sf/os/devicesrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/devicesrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/devicesrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/graphics				sf/os/graphics" />
-				<command cmd="&cmd.update;"		dir="sf/os/graphics" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/graphics" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/kernelhwsrv			sf/os/kernelhwsrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/kernelhwsrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/kernelhwsrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/mm						sf/os/mm" />
-				<command cmd="&cmd.update;"		dir="sf/os/mm" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/mm" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/ossrv					sf/os/ossrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/ossrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/ossrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/shortlinksrv			sf/os/shortlinksrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/shortlinksrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/shortlinksrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sftools/ana/compatanamdw		sftools/ana/compatanamdw" />
-				<command cmd="&cmd.update;"		dir="sftools/ana/compatanamdw" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="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.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">
-			<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"/>
+			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
+				<component id="mmtestenv" name="Multimedia Test Framework Server">
+					<unit bldFile="sf/os/mm/mmtestenv/mmtestfw/group" />
 				</component>
 			</collection>
-			<collection name="hostconnsis" long-name="50_asp_hostconn.sis">
-				<component id="hostconn" name="Hostlet Connection Test">
-					<unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/>
+			<collection name="ossrv" long-name="OS Services">
+				<component id="stdcpp" name="Standard C++">
+					<unit bldFile="sf/os/ossrv/stdcpp/tsrc/BC/group" />
 				</component>
 			</collection>
-			<collection name="newsoapclassessis" long-name="50_asp_newsoapclasses.sis">
-				<component id="newsoapclasses" name="New SOAP Classes Test">
-					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/>
-				</component>
-			</collection>
-			<collection name="favouritesbctestsis" long-name="50_Browser_Favourites.SIS">
-				<component id="favouritesbctest" name="Browser Favourites BC Test">
-					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
+			<collection name="appinstall" long-name="Application Install Middleware">
+				<component id="appinstall_pub" name="Application Install Middleware Puplic">
+					<unit bldFile="sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/BC/StartupListManagementAPI/SelfSignedStartupApp/group" />
+					<unit bldFile="sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/BC/StartupListManagementAPI/StartupApp/group" />
 				</component>
 			</collection>
-			<collection name="downloadmgrbctestsis" long-name="50_Browser_DownloadMgr.SIS">
-				<component id="downloadmgrbctest" name="Download Manager BC Test">
-					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group"/>
-				</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>
-
-			<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"/>
+			<collection name="appsupport" long-name="Application Support Middleware">
+				<component id="appsupport_pub" name="Application Support Middleware Puplic">
+					<unit bldFile="sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group" />
+					<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/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"/>
+			<collection name="drm" long-name="DRM Middleware">
+				<component id="drm_pub" name="DRM Middleware Public">
+					<unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group" />
+				</component>
+			</collection>
+			<collection name="locationsrv" long-name="Location Server Middleware">
+				<component id="locsrv_pub" name="Location Server Middleware Public">
+					<unit bldFile="sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_Api/group" />
+				</component>
+			</collection>
+			<collection name="messagingmw" long-name="Messaging Middleware">
+				<component id="msgfw_pub" name="Messaging Middleware Public">
+					<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"/>
+			<collection name="websrv" long-name="Web Services Middleware">
+				<component id="websrv_pub" name="Web Services Middleware Public">
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/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>
-
-			<collection name="pbkdataaddeditsis" long-name="50_PIM_PbkDataAddEdit.SIS">
-				<component id="pbkdataaddedit" name="Phonebook Data Add Edit BC Test">
-					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/>
-				</component>
-			</collection>
-
-			<collection name="pbkdatamanagementsis" long-name="50_PIM_PbkDataMgmt.SIS">
-				<component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
-					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
+			<collection name="contacts" long-name="Contacts Application">
+				<component id="contacts_pub" name="Contacts Application Public">
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group" />
 				</component>
 			</collection>
-
-			<collection name="pbkfetchuisis" long-name="50_PIM_PbkFetchAPI.SIS">
-				<component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
-					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/>
+			<collection name="location" long-name="Location Application">
+				<component id="loc_pub" name="Location Application Public">
+					<unit bldFile="sf/app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/bcapplmkeditor/group" />
+					<unit bldFile="sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/bcapplmkitemiddbcombiinfo/group" />
+					<unit bldFile="sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/bcapplmkselector/group" />
+				</component>
+			</collection>
+			<collection name="messaging" long-name="Messaging Application">
+				<component id="msg_pub" name="Messaging Application Public">
+					<unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group" />
 				</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>
-
-			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
-				<component id="testfwsrv" name="Multimedia Test Framework Server">
-					<unit bldFile="sf/os/mm/mmtestenv/mmtestfw/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"/>
+			<collection name="compatanamdw" long-name="Compatibilty Analysis">
+				<component id="apicompatanamdw" name="Compatibilty Analysis API Compatibility">
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/BrCtlBCTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LocationFW/LocAquisition/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/apps/mrt/apps/glib/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/apps/mrt/apps/ssl/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/multimedia/apps/BCAppContentManagement/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/networking/apps/ConnectionSettings/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/networking/apps/ConnectionSettingsUI/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/rtcct/apps/BCLogEngineTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/rtcct/apps/IsvTelephonyTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/systemsw/apps/cenrepnotifyhandler/group" />
 				</component>
 			</collection>
 		</layer>
 		<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"/>
+			<collection name="devicesrv" long-name="Device Services">
+				<component id="devicesrv_pub" name="Device Services Public">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group" />
+				</component>
+				<component id="resourcemgmt" name="Resource Management">
+					<unit bldFile="sf/os/devicesrv/resourcemgmt/tsrc/public/basic/group" />
 				</component>
 			</collection>
-
-			<collection name="graphicssvs" long-name="SVS Graphics API Tests">
-				<component id="graphicssvs" name="SVS Graphics API Tests" class="test">
-					<unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group"/>
+			<collection name="graphics" long-name="Graphics">
+				<component id="graphicsapitest" name="SVS Graphics API Tests">
+					<unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group" />
 				</component>
 			</collection>
-
-			<!-- OS Services SVS -->
-			<collection name="systemlibrariessvs" long-name="SVS System Libraries API Tests">
-				<component id="syslibssvs" name="SysLibs SVS Suite" class="test">
-					<unit bldFile="sf/os/ossrv/syslibsapitest/syslibssvs/group"/>
+			<collection name="kernelhwsrv" long-name="Kernal Hardware Services">
+				<component id="baseapitest" name="SVS Base API Tests">
+					<unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group" />
+				</component>
+			</collection>
+			<collection name="mm" long-name="Multimedia">
+				<component id="mmapitest" name="Multimedia SVS Suite">
+					<unit bldFile="sf/os/mm/mmapitest/mmsvs/suite/group" />
+				</component>
+			</collection>
+			<collection name="ossrv" long-name="OS Services">
+				<component id="syslibsapitest" name="SysLibs SVS Suite">
+					<unit bldFile="sf/os/ossrv/syslibsapitest/syslibssvs/group" />
 				</component>
 			</collection>
-
-			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
-				<component id="mmsvs" name="Multimedia SVS Suite" class="test">
-					<unit bldFile="sf/os/mm/mmapitest/mmsvs/suite/group"/>
+			<collection name="shortlinksrv" long-name="Short Link Services">
+				<component id="bluetoothapitest" name="SVS Bluetooth API Tests">
+					<unit bldFile="sf/os/shortlinksrv/bluetoothapitest/bluetoothsvs/group" />
+				</component>
+			</collection>
+			<collection name="appsupport" long-name="Application Support Middleware">
+				<component id="appsupport_pub" name="Application Support Middleware Puplic">
+					<unit bldFile="sf/mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group" />
+				</component>
+			</collection>
+			<collection name="websrv" long-name="Web Services Middleware">
+				<component id="websrv_pub" name="Web Services Middleware Public">
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmentTester/group" />
 				</component>
 			</collection>
 		</layer>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/ssl/ssl.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/ssl/ssl.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,103 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Secure Socket Layer BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "ssltest.zip";
+rmtree "temp";
+mkpath "temp/ssltest/general/testframework";
+mkpath "temp/ssltest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("ssl.xml",	"temp/test.xml");
+
+copy($epoc . "winscw/c/testframework/crypto_test/testframework.ini",	"temp/ssltest/general/testframework/testframework.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/crypto_test.cfg",	"temp/ssltest/general/testframework/crypto_test.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/evptests.txt",		"temp/ssltest/general/testframework/evptests.txt") or die "failed : $!";
+copy($epoc . "winscw/c/tpkcs7d.txt",					"temp/ssltest/general/testframework/tpkcs7d.txt") or die "failed : $!";
+copy($epoc . "winscw/c/tpkcs7.txt",						"temp/ssltest/general/testframework/tpkcs7.txt") or die "failed : $!";
+copy($epoc . "winscw/c/treq2.txt",						"temp/ssltest/general/testframework/treq2.txt") or die "failed : $!";
+copy($epoc . "winscw/c/treq.txt",						"temp/ssltest/general/testframework/treq.txt") or die "failed : $!";
+copy($epoc . "winscw/c/trsa.txt",						"temp/ssltest/general/testframework/trsa.txt") or die "failed : $!";
+copy($epoc . "winscw/c/tsid.txt",						"temp/ssltest/general/testframework/tsid.txt") or die "failed : $!";
+copy($epoc . "winscw/c/tx5091.txt",						"temp/ssltest/general/testframework/tx5091.txt") or die "failed : $!";
+copy($epoc . "winscw/c/tx5092.txt",						"temp/ssltest/general/testframework/tx5092.txt") or die "failed : $!";
+copy($epoc . "winscw/c/tx509.txt",						"temp/ssltest/general/testframework/tx509.txt") or die "failed : $!";
+copy($epoc . "winscw/c/tcrl.txt",						"temp/ssltest/general/testframework/tcrl.txt") or die "failed : $!";
+copy($epoc . "winscw/c/testenc.txt",					"temp/ssltest/general/testframework/testenc.txt") or die "failed : $!";
+copy($epoc . "winscw/c/testgen.txt",					"temp/ssltest/general/testframework/testgen.txt") or die "failed : $!";
+copy($epoc . "winscw/c/testss.txt",						"temp/ssltest/general/testframework/testss.txt") or die "failed : $!";
+copy($epoc . "winscw/c/test_verify.txt",				"temp/ssltest/general/testframework/test_verify.txt") or die "failed : $!";
+copy($epoc . "winscw/c/CAss.cnf",						"temp/ssltest/general/testframework/CAss.cnf") or die "failed : $!";
+copy($epoc . "winscw/c/openssl.cnf",					"temp/ssltest/general/testframework/openssl.cnf") or die "failed : $!";
+copy($epoc . "winscw/c/P1ss.cnf",						"temp/ssltest/general/testframework/P1ss.cnf") or die "failed : $!";
+copy($epoc . "winscw/c/P2ss.cnf",						"temp/ssltest/general/testframework/P2ss.cnf") or die "failed : $!";
+copy($epoc . "winscw/c/test.cnf",						"temp/ssltest/general/testframework/test.cnf") or die "failed : $!";
+copy($epoc . "winscw/c/Uss.cnf",						"temp/ssltest/general/testframework/Uss.cnf") or die "failed : $!";
+copy($epoc . "winscw/c/argena.pem",						"temp/ssltest/general/testframework/argena.pem") or die "failed : $!";
+copy($epoc . "winscw/c/argeng.pem",						"temp/ssltest/general/testframework/argeng.pem") or die "failed : $!";
+copy($epoc . "winscw/c/eng1.pem",						"temp/ssltest/general/testframework/eng1.pem") or die "failed : $!";
+copy($epoc . "winscw/c/eng2.pem",						"temp/ssltest/general/testframework/eng2.pem") or die "failed : $!";
+copy($epoc . "winscw/c/eng3.pem",						"temp/ssltest/general/testframework/eng3.pem") or die "failed : $!";
+copy($epoc . "winscw/c/eng4.pem",						"temp/ssltest/general/testframework/eng4.pem") or die "failed : $!";
+copy($epoc . "winscw/c/eng5.pem",						"temp/ssltest/general/testframework/eng5.pem") or die "failed : $!";
+copy($epoc . "winscw/c/pkcs7-1.pem",					"temp/ssltest/general/testframework/pkcs7-1.pem") or die "failed : $!";
+copy($epoc . "winscw/c/RegTP-5R.pem",					"temp/ssltest/general/testframework/RegTP-5R.pem") or die "failed : $!";
+copy($epoc . "winscw/c/RegTP-6R.pem",					"temp/ssltest/general/testframework/RegTP-6R.pem") or die "failed : $!";
+copy($epoc . "winscw/c/testcrl.pem",					"temp/ssltest/general/testframework/testcrl.pem") or die "failed : $!";
+copy($epoc . "winscw/c/testp7.pem",						"temp/ssltest/general/testframework/testp7.pem") or die "failed : $!";
+copy($epoc . "winscw/c/testreq.pem",					"temp/ssltest/general/testframework/testreq.pem") or die "failed : $!";
+copy($epoc . "winscw/c/testreq2.pem",					"temp/ssltest/general/testframework/testreq2.pem") or die "failed : $!";
+copy($epoc . "winscw/c/testrsa.pem",					"temp/ssltest/general/testframework/testrsa.pem") or die "failed : $!";
+copy($epoc . "winscw/c/testsid.pem",					"temp/ssltest/general/testframework/testsid.pem") or die "failed : $!";
+copy($epoc . "winscw/c/testx509.pem",					"temp/ssltest/general/testframework/testx509.pem") or die "failed : $!";
+copy($epoc . "winscw/c/thawteCb.pem",					"temp/ssltest/general/testframework/thawteCb.pem") or die "failed : $!";
+copy($epoc . "winscw/c/thawteCp.pem",					"temp/ssltest/general/testframework/thawteCp.pem") or die "failed : $!";
+copy($epoc . "winscw/c/v3-cert1.pem",					"temp/ssltest/general/testframework/v3-cert1.pem") or die "failed : $!";
+copy($epoc . "winscw/c/v3-cert2.pem",					"temp/ssltest/general/testframework/v3-cert2.pem") or die "failed : $!";
+copy($epoc . "winscw/c/vsign1.pem",						"temp/ssltest/general/testframework/vsign1.pem") or die "failed : $!";
+copy($epoc . "winscw/c/vsign3.pem",						"temp/ssltest/general/testframework/vsign3.pem") or die "failed : $!";
+copy($epoc . "winscw/c/vsignss.pem",					"temp/ssltest/general/testframework/vsignss.pem") or die "failed : $!";
+copy($epoc . "winscw/c/wellsfgo.pem",					"temp/ssltest/general/testframework/wellsfgo.pem") or die "failed : $!";
+copy($epoc . "winscw/c/certCA.ss",						"temp/ssltest/general/testframework/certCA.ss") or die "failed : $!";
+copy($epoc . "winscw/c/certU.ss",						"temp/ssltest/general/testframework/certU.ss") or die "failed : $!";
+copy($epoc . "winscw/c/keyCA.ss",						"temp/ssltest/general/testframework/keyCA.ss") or die "failed : $!";
+copy($epoc . "winscw/c/keyU.ss",						"temp/ssltest/general/testframework/keyU.ss") or die "failed : $!";
+copy($epoc . "winscw/c/reqCA.ss",						"temp/ssltest/general/testframework/reqCA.ss") or die "failed : $!";
+copy($epoc . "winscw/c/reqU.ss",						"temp/ssltest/general/testframework/reqU.ss") or die "failed : $!";
+copy($epoc . "winscw/c/reqCA.ss2",						"temp/ssltest/general/testframework/reqCA.ss2") or die "failed : $!";
+copy($epoc . "winscw/c/certP1.ss",						"temp/ssltest/general/testframework/certP1.ss") or die "failed : $!";
+copy($epoc . "winscw/c/certP2.ss",						"temp/ssltest/general/testframework/certP2.ss") or die "failed : $!";
+copy($epoc . "winscw/c/intP1.ss",						"temp/ssltest/general/testframework/intP1.ss") or die "failed : $!";
+copy($epoc . "winscw/c/intP2.ss",						"temp/ssltest/general/testframework/intP2.ss") or die "failed : $!";
+copy($epoc . "winscw/c/keyP1.ss",						"temp/ssltest/general/testframework/keyP1.ss") or die "failed : $!";
+copy($epoc . "winscw/c/keyP2.ss",						"temp/ssltest/general/testframework/keyP2.ss") or die "failed : $!";
+copy($epoc . "winscw/c/reqP1.ss",						"temp/ssltest/general/testframework/reqP1.ss") or die "failed : $!";
+copy($epoc . "winscw/c/reqP2.ss",						"temp/ssltest/general/testframework/reqP2.ss") or die "failed : $!";
+copy($epoc . "winscw/c/tmp_intP2.ss",					"temp/ssltest/general/testframework/tmp_intP2.ss") or die "failed : $!";
+copy($epoc . "winscw/c/Makefile",						"temp/ssltest/general/testframework/Makefile") or die "failed : $!";
+copy($epoc . "winscw/c/ca_cert.der",					"temp/ssltest/general/testframework/ca_cert.der") or die "failed : $!";
+copy($epoc . "winscw/c/ca_cert.pem",					"temp/ssltest/general/testframework/ca_cert.pem") or die "failed : $!";
+copy($epoc . "winscw/c/server.pem",						"temp/ssltest/general/testframework/server.pem") or die "failed : $!";
+copy($epoc . "winscw/c/server2.pem",					"temp/ssltest/general/testframework/server2.pem") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/crypto_test.dll",		"temp/ssltest/winscw_udeb/crypto_test.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/openssl.exe",			"temp/ssltest/winscw_udeb/openssl.exe") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/ssltest.exe",			"temp/ssltest/winscw_udeb/ssltest.exe") or die "failed : $!";
+
+system("7z a -tzip ssltest.zip ./temp/*");
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/ssl/ssl.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/ssl/ssl.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,1181 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>Secure Socket Layer BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Secure Socket Layer BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Secure Socket Layer Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="ssl" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="ssl" 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="crypto_test.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="crypto_test.dll"/>
+							<param dst="c:\sys\bin\crypto_test.dll"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+                    <step id="" name="openssl.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="openssl.exe"/>
+							<param dst="c:\sys\bin\openssl.exe"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+                    <step id="" name="ssltest.exe (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="ssltest.exe"/>
+							<param dst="c:\sys\bin\ssltest.exe"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testframework.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework.ini"/>
+							<param dst="c:\testframework\crypto_test\testframework.ini"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="crypto_test.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/crypto_test.cfg"/>
+							<param dst="c:\testframework\crypto_test.cfg"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="evptests.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/evptests.txt"/>
+							<param dst="c:\testframework\evptests.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tpkcs7d.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tpkcs7d.txt"/>
+							<param dst="c:\tpkcs7d.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tpkcs7.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tpkcs7.txt"/>
+							<param dst="c:\tpkcs7.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="treq2.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/treq2.txt"/>
+							<param dst="c:\treq2.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="treq.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/treq.txt"/>
+							<param dst="c:\treq.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="trsa.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/trsa.txt"/>
+							<param dst="c:\trsa.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tsid.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tsid.txt"/>
+							<param dst="c:\tsid.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tx5091.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tx5091.txt"/>
+							<param dst="c:\tx5091.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tx5092.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tx5092.txt"/>
+							<param dst="c:\tx5092.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tx509.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tx509.txt"/>
+							<param dst="c:\tx509.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tcrl.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tcrl.txt"/>
+							<param dst="c:\tcrl.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testenc.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testenc.txt"/>
+							<param dst="c:\testenc.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testgen.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testgen.txt"/>
+							<param dst="c:\testgen.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testss.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testss.txt"/>
+							<param dst="c:\testss.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="test_verify.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/test_verify.txt"/>
+							<param dst="c:\test_verify.txt"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="CAss.cnf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/CAss.cnf"/>
+							<param dst="c:\CAss.cnf"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="openssl.cnf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/openssl.cnf"/>
+							<param dst="c:\openssl.cnf"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="P1ss.cnf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/P1ss.cnf"/>
+							<param dst="c:\P1ss.cnf"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="P2ss.cnf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/P2ss.cnf"/>
+							<param dst="c:\P2ss.cnf"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="test.cnf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/test.cnf"/>
+							<param dst="c:\test.cnf"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="Uss.cnf (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/Uss.cnf"/>
+							<param dst="c:\Uss.cnf"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="argena.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/argena.pem"/>
+							<param dst="c:\argena.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="argeng.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/argeng.pem"/>
+							<param dst="c:\argeng.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="eng1.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/eng1.pem"/>
+							<param dst="c:\eng1.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="eng2.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/eng2.pem"/>
+							<param dst="c:\eng2.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="eng3.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/eng3.pem"/>
+							<param dst="c:\eng3.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="eng4.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/eng4.pem"/>
+							<param dst="c:\eng4.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="eng5.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/eng5.pem"/>
+							<param dst="c:\eng5.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="pkcs7-1.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/pkcs7-1.pem"/>
+							<param dst="c:\pkcs7-1.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="RegTP-5R.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/RegTP-5R.pem"/>
+							<param dst="c:\RegTP-5R.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="RegTP-6R.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/RegTP-6R.pem"/>
+							<param dst="c:\RegTP-6R.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testcrl.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testcrl.pem"/>
+							<param dst="c:\testcrl.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testp7.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testp7.pem"/>
+							<param dst="c:\testp7.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testreq.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testreq.pem"/>
+							<param dst="c:\testreq.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testreq2.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testreq2.pem"/>
+							<param dst="c:\testreq2.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testrsa.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testrsa.pem"/>
+							<param dst="c:\testrsa.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testsid.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testsid.pem"/>
+							<param dst="c:\testsid.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="testx509.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testx509.pem"/>
+							<param dst="c:\testx509.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="thawteCb.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/thawteCb.pem"/>
+							<param dst="c:\thawteCb.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="thawteCp.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/thawteCp.pem"/>
+							<param dst="c:\thawteCp.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="v3-cert1.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/v3-cert1.pem"/>
+							<param dst="c:\v3-cert1.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="v3-cert2.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/v3-cert2.pem"/>
+							<param dst="c:\v3-cert2.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="vsign1.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/vsign1.pem"/>
+							<param dst="c:\vsign1.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="vsign3.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/vsign3.pem"/>
+							<param dst="c:\vsign3.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="vsignss.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/vsignss.pem"/>
+							<param dst="c:\vsignss.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="wellsfgo.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/wellsfgo.pem"/>
+							<param dst="c:\wellsfgo.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="certCA.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/certCA.ss"/>
+							<param dst="c:\certCA.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="certU.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/certU.ss"/>
+							<param dst="c:\certU.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="keyCA.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/keyCA.ss"/>
+							<param dst="c:\keyCA.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="keyU.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/keyU.ss"/>
+							<param dst="c:\keyU.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="reqCA.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/reqCA.ss"/>
+							<param dst="c:\reqCA.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="reqU.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/reqU.ss"/>
+							<param dst="c:\reqU.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="reqCA.ss2 (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/reqCA.ss2"/>
+							<param dst="c:\reqCA.ss2"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="certP1.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/certP1.ss"/>
+							<param dst="c:\certP1.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="certP2.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/certP2.ss"/>
+							<param dst="c:\certP2.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="intP1.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/intP1.ss"/>
+							<param dst="c:\intP1.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="intP2.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/intP2.ss"/>
+							<param dst="c:\intP2.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="keyP1.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/keyP1.ss"/>
+							<param dst="c:\keyP1.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="keyP2.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/keyP2.ss"/>
+							<param dst="c:\keyP2.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="reqP1.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/reqP1.ss"/>
+							<param dst="c:\reqP1.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="reqP2.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/reqP2.ss"/>
+							<param dst="c:\reqP2.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tmp_intP2.ss (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tmp_intP2.ss"/>
+							<param dst="c:\tmp_intP2.ss"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="Makefile (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/Makefile"/>
+							<param dst="c:\Makefile"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="ca_cert.der (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/ca_cert.der"/>
+							<param dst="c:\ca_cert.der"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="ca_cert.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/ca_cert.pem"/>
+							<param dst="c:\ca_cert.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="server.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/server.pem"/>
+							<param dst="c:\server.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="server2.pem (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/server2.pem"/>
+							<param dst="c:\server2.pem"/>
+							<param component-path="ssltest" />
+						</params>
+					</step>
+					<step id="" name="tpkcs7d (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\tpkcs7d.txt"/>
+							<param result-file="c:\spd_logs\xml\tpkcs7d(3_50_2_6736).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="treq2 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\treq2.txt"/>
+							<param result-file="c:\spd_logs\xml\treq2(3_50_2_6738).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>					
+					<step id="" name="treq (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\treq.txt"/>
+							<param result-file="c:\spd_logs\xml\treq(3_50_2_6737).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="trsa (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\trsa.txt"/>
+							<param result-file="c:\spd_logs\xml\trsa(3_50_2_6739).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="tsid (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\tsid.txt"/>
+							<param result-file="c:\spd_logs\xml\tsid(3_50_2_6740).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="tx5091 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\tx5091.txt"/>
+							<param result-file="c:\spd_logs\xml\tx509_1(3_50_2_6742).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="tx5092 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\tx5092.txt"/>
+							<param result-file="c:\spd_logs\xml\tx509_2(3_50_2_6743).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="tx509 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\tx509.txt"/>
+							<param result-file="c:\spd_logs\xml\tx509(3_50_2_6741).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="tcrl (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\tcrl.txt"/>
+							<param result-file="c:\spd_logs\xml\tcrl(3_50_2_6744).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="testenc (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\testenc.txt"/>
+							<param result-file="c:\spd_logs\xml\testenc(3_50_2_6732).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="testgen (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\testgen.txt"/>
+							<param result-file="c:\spd_logs\xml\testgen(3_50_2_6733).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="testss (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\testss.txt"/>
+							<param result-file="c:\spd_logs\xml\testss(3_50_2_6735).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="test_verify (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\test_verify.txt"/>
+							<param result-file="c:\spd_logs\xml\test_verify(3_50_2_6745).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="tpkcs7 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="openssl.exe"/>
+							<param parameters="c:\tpkcs7.txt"/>
+							<param result-file="c:\spd_logs\xml\tpkcs7(3_50_2_6734).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="crypto_test (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\testframework\crypto_test.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="crypto_test (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6669) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6669) -test_cipherlist"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6669).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6670) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6670) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6670).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6671) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6671) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2 -server_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6671).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6672) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6672) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2 -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6672).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6673) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6673) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2 -server_auth -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6673).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6674) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6674) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6674).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6675) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6675) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2 -server_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6675).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6676) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6676) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2 -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6676).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6677) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6677) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -ssl2 -server_auth -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6677).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6678) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6678) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6678).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6679) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6679) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -server_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6679).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6680) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6680) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6680).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6681) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6681) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -server_auth -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6681).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6682) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6682) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6682).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6683) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6683) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2 -server_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6683).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6684) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6684) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2 -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6684).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6685) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6685) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2 -server_auth -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6685).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6686) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="sltest(3_19_2_6686) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2"/>
+							<param result-file="c:\spd_logs\xml\sltest(3_19_2_6686).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6687) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6687) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6687).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6688) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6688) -key C:/keyU.ss -cert C:/certU.ss -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6688).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6689) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6689) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -ssl2"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6689).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6690) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6690) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6690).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6691) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6691) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -no_dhe"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6691).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6692) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6692) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -dhe1024dsa -v"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6692).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6693) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6693) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -server_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6693).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6694) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6694) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6694).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6695) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6695) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -server_auth -client_auth -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6695).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6696) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6696) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -bio_pair -server_auth -client_auth -app_verify -CAfile C:/certCA.ss"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6696).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6697) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6697) -key C:/keyU.ss -cert C:/certU.ss -c_key C:/keyU.ss -c_cert C:/certU.ss -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6697).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6698) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6698) -v -bio_pair -tls1 -cert C:/server2.pem -no_dhe -num 10-f -time"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6698).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6699) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6699) -v -bio_pair -tls1 -cert c:/server2.pem -dhe1024dsa -num 10 -f -time"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6699).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="ssltest(3_19_2_6773) (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="ssltest.exe"/>
+							<param parameters="ssltest(3_19_2_6773) -symstore"/>
+							<param result-file="c:\spd_logs\xml\ssltest(3_19_2_6773).xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>ssltest/general/testframework/crypto_test.cfg</file>
+		<file>ssltest/general/testframework/TestFramework.ini</file>
+		<file>ssltest/general/testframework/evptests.txt</file>
+		<file>ssltest/general/testframework/tpkcs7d.txt</file>
+		<file>ssltest/general/testframework/tpkcs7.txt</file>
+		<file>ssltest/general/testframework/treq2.txt</file>
+		<file>ssltest/general/testframework/treq.txt</file>
+		<file>ssltest/general/testframework/trsa.txt</file>
+		<file>ssltest/general/testframework/tsid.txt</file>
+		<file>ssltest/general/testframework/tx5091.txt</file>
+		<file>ssltest/general/testframework/tx5092.txt</file>
+		<file>ssltest/general/testframework/tx509.txt</file>
+		<file>ssltest/general/testframework/tcrl.txt</file>
+		<file>ssltest/general/testframework/testenc.txt</file>
+		<file>ssltest/general/testframework/testgen.txt</file>
+		<file>ssltest/general/testframework/testss.txt</file>
+		<file>ssltest/general/testframework/test_verify.txt</file>
+		<file>ssltest/general/testframework/CAss.cnf</file>
+		<file>ssltest/general/testframework/openssl.cnf</file>
+		<file>ssltest/general/testframework/P1ss.cnf</file>
+		<file>ssltest/general/testframework/P2ss.cnf</file>
+		<file>ssltest/general/testframework/test.cnf</file>
+		<file>ssltest/general/testframework/Uss.cnf</file>
+		<file>ssltest/general/testframework/argena.pem</file>
+		<file>ssltest/general/testframework/argeng.pem</file>
+		<file>ssltest/general/testframework/eng1.pem</file>
+		<file>ssltest/general/testframework/eng2.pem</file>
+		<file>ssltest/general/testframework/eng3.pem</file>
+		<file>ssltest/general/testframework/eng4.pem</file>
+		<file>ssltest/general/testframework/eng5.pem</file>
+		<file>ssltest/general/testframework/pkcs7-1.pem</file>
+		<file>ssltest/general/testframework/RegTP-5R.pem</file>
+		<file>ssltest/general/testframework/RegTP-6R.pem</file>
+		<file>ssltest/general/testframework/testcrl.pem</file>
+		<file>ssltest/general/testframework/testp7.pem</file>
+		<file>ssltest/general/testframework/testreq.pem</file>
+		<file>ssltest/general/testframework/testreq2.pem</file>
+		<file>ssltest/general/testframework/testrsa.pem</file>
+		<file>ssltest/general/testframework/testsid.pem</file>
+		<file>ssltest/general/testframework/testx509.pem</file>
+		<file>ssltest/general/testframework/thawteCb.pem</file>
+		<file>ssltest/general/testframework/thawteCp.pem</file>
+		<file>ssltest/general/testframework/v3-cert1.pem</file>
+		<file>ssltest/general/testframework/v3-cert2.pem</file>
+		<file>ssltest/general/testframework/vsign1.pem</file>
+		<file>ssltest/general/testframework/vsign3.pem</file>
+		<file>ssltest/general/testframework/vsignss.pem</file>
+		<file>ssltest/general/testframework/wellsfgo.pem</file>
+		<file>ssltest/general/testframework/certCA.ss</file>
+		<file>ssltest/general/testframework/certU.ss</file>
+		<file>ssltest/general/testframework/keyCA.ss</file>
+		<file>ssltest/general/testframework/keyU.ss</file>
+		<file>ssltest/general/testframework/reqCA.ss</file>
+		<file>ssltest/general/testframework/reqU.ss</file>
+		<file>ssltest/general/testframework/reqCA.ss2</file>
+		<file>ssltest/general/testframework/certP1.ss</file>
+		<file>ssltest/general/testframework/certP2.ss</file>
+		<file>ssltest/general/testframework/intP1.ss</file>
+		<file>ssltest/general/testframework/intP2.ss</file>
+		<file>ssltest/general/testframework/keyP1.ss</file>
+		<file>ssltest/general/testframework/keyP2.ss</file>
+		<file>ssltest/general/testframework/reqP1.ss</file>
+		<file>ssltest/general/testframework/reqP2.ss</file>
+		<file>ssltest/general/testframework/tmp_intP2.ss</file>
+		<file>ssltest/general/testframework/Makefile</file>
+		<file>ssltest/general/testframework/ca_cert.der</file>
+		<file>ssltest/general/testframework/ca_cert.pem</file>
+		<file>ssltest/general/testframework/server.pem</file>
+		<file>ssltest/general/testframework/server2.pem</file>
+		<file>ssltest/winscw_udeb/crypto_test.dll</file>
+		<file>ssltest/winscw_udeb/openssl.exe</file>
+		<file>ssltest/winscw_udeb/ssltest.exe</file>
+	</files>
+</test>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/stdcpp/stdcpp.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/stdcpp/stdcpp.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for STDCPP BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "stdcpptest.zip";
+rmtree "temp";
+mkpath "temp/stdcpptest/general/testframework";
+mkpath "temp/stdcpptest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("stdcpp.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/bccppwrap.dll",					"temp/stdcpptest/winscw_udeb/bccppwrap.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCCSRuntimeSup.dll",				"temp/stdcpptest/winscw_udeb/BCCSRuntimeSup.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCException.dll",					"temp/stdcpptest/winscw_udeb/BCException.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCNoNamespace.dll",				"temp/stdcpptest/winscw_udeb/BCNoNamespace.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCOpenCHeaders.dll",				"temp/stdcpptest/winscw_udeb/BCOpenCHeaders.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCOpenCWrap.dll",					"temp/stdcpptest/winscw_udeb/BCOpenCWrap.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCThread.dll",					"temp/stdcpptest/winscw_udeb/BCThread.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCTypeAttrib.dll",				"temp/stdcpptest/winscw_udeb/BCTypeAttrib.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/BCTypeInfo.dll",					"temp/stdcpptest/winscw_udeb/BCTypeInfo.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/chartypes.dll",					"temp/stdcpptest/winscw_udeb/chartypes.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tmath_operations.dll",			"temp/stdcpptest/winscw_udeb/tmath_operations.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tmemory.dll",						"temp/stdcpptest/winscw_udeb/tmemory.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tutility.dll",					"temp/stdcpptest/winscw_udeb/tutility.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/widecharclassapiBCTest.dll",		"temp/stdcpptest/winscw_udeb/widecharclassapiBCTest.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tlocale.dll",						"temp/stdcpptest/winscw_udeb/tlocale.dll") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/tstl_1.dll",						"temp/stdcpptest/winscw_udeb/tstl_1.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_cppwrap.ini",	"temp/stdcpptest/general/testframework/testframework_cppwrap.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtruntime.ini",	"temp/stdcpptest/general/testframework/testframework_mrtruntime.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtexp.ini",		"temp/stdcpptest/general/testframework/testframework_mrtexp.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtnons.ini",	"temp/stdcpptest/general/testframework/testframework_mrtnons.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtopench.ini",	"temp/stdcpptest/general/testframework/testframework_mrtopench.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_ocw.ini",		"temp/stdcpptest/general/testframework/testframework_ocw.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtthread.ini",	"temp/stdcpptest/general/testframework/testframework_mrtthread.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrttypea.ini",	"temp/stdcpptest/general/testframework/testframework_mrttypea.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrttypei.ini",	"temp/stdcpptest/general/testframework/testframework_mrttypei.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_ct.ini",			"temp/stdcpptest/general/testframework/testframework_ct.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtmath.ini",	"temp/stdcpptest/general/testframework/testframework_mrtmath.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtmem.ini",		"temp/stdcpptest/general/testframework/testframework_mrtmem.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_mrtutil.ini",	"temp/stdcpptest/general/testframework/testframework_mrtutil.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_wc.ini",			"temp/stdcpptest/general/testframework/testframework_wc.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_tlocale.ini",	"temp/stdcpptest/general/testframework/testframework_tlocale.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_tstl_1.ini",		"temp/stdcpptest/general/testframework/testframework_tstl_1.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/bccppwrap.cfg",				"temp/stdcpptest/general/testframework/bccppwrap.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCCSRuntimeSup.cfg",			"temp/stdcpptest/general/testframework/BCCSRuntimeSup.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCException.cfg",				"temp/stdcpptest/general/testframework/BCException.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCNoNamespace.cfg",			"temp/stdcpptest/general/testframework/BCNoNamespace.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCOpenCHeaders.cfg",			"temp/stdcpptest/general/testframework/BCOpenCHeaders.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCOpenCWrap.cfg",				"temp/stdcpptest/general/testframework/BCOpenCWrap.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCThread.cfg",					"temp/stdcpptest/general/testframework/BCThread.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCTypeAttrib.cfg",				"temp/stdcpptest/general/testframework/BCTypeAttrib.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BCTypeInfo.cfg",				"temp/stdcpptest/general/testframework/BCTypeInfo.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tmath_operations.cfg",			"temp/stdcpptest/general/testframework/tmath_operations.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tmemory.cfg",					"temp/stdcpptest/general/testframework/tmemory.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tutility.cfg",					"temp/stdcpptest/general/testframework/tutility.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tlocale.cfg",					"temp/stdcpptest/general/testframework/tlocale.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tstl_1.cfg",					"temp/stdcpptest/general/testframework/tstl_1.cfg") or die "failed : $!";
+
+system("7z a -tzip stdcpptest.zip ./temp/*");
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/stdcpp/stdcpp.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/stdcpp/stdcpp.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,882 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>STDCPP BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="STDCPP BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="STDCPP Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="bccppwrap" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bccppwrap" 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="bccppwrap.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bccppwrap.dll"/>
+							<param dst="c:\sys\bin\bccppwrap.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="TestFramework_cppwrap.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/TestFramework_cppwrap.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bccppwrap.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bccppwrap.cfg"/>
+							<param dst="c:\testframework\bccppwrap.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bccppwrap (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\bccppwrap.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bccppwrap (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bccsruntimesup" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bccsruntimesup" 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="bccsruntimesup.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bccsruntimesup.dll"/>
+							<param dst="c:\sys\bin\bccsruntimesup.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrtruntime.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrtruntime.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bccsruntimesup.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bccsruntimesup.cfg"/>
+							<param dst="c:\testframework\bccsruntimesup.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bccsruntimesup (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\bccsruntimesup.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bccsruntimesup (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bcexception" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bcexception" 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="bcexception.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcexception.dll"/>
+							<param dst="c:\sys\bin\bcexception.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="TestFramework_mrtexp.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/TestFramework_mrtexp.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcexception.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bcexception.cfg"/>
+							<param dst="c:\testframework\bcexception.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcexception (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\bcexception.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bcexception (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bcnonamespace" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bcnonamespace" 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="bcnonamespace.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcnonamespace.dll"/>
+							<param dst="c:\sys\bin\bcnonamespace.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrtnons.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrtnons.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcnonamespace.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bcnonamespace.cfg"/>
+							<param dst="c:\testframework\bcnonamespace.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcnonamespace (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\bcnonamespace.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bcnonamespace (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bcopencheaders" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bcopencheaders" 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="bcopencheaders.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcopencheaders.dll"/>
+							<param dst="c:\sys\bin\bcopencheaders.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrtopench.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrtopench.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcopencheaders.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bcopencheaders.cfg"/>
+							<param dst="c:\testframework\bcopencheaders.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcopencheaders (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\bcopencheaders.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bcopencheaders (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bcopencwrap" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bcopencwrap" 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="bcopencwrap.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcopencwrap.dll"/>
+							<param dst="c:\sys\bin\bcopencwrap.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_ocw.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_ocw.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcopencwrap.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bcopencwrap.cfg"/>
+							<param dst="c:\testframework\bcopencwrap.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcopencwrap (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\BCOpenCWrap.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bcopencwrap (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bcthread" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bcthread" 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="bcthread.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcthread.dll"/>
+							<param dst="c:\sys\bin\bcthread.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrtthread.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrtthread.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcthread.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bcthread.cfg"/>
+							<param dst="c:\testframework\bcthread.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bcthread (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\bcthread.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bcthread (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bctypeattrib" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bctypeattrib" 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="bctypeattrib.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctypeattrib.dll"/>
+							<param dst="c:\sys\bin\bctypeattrib.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrttypea.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrttypea.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bctypeattrib.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bctypeattrib.cfg"/>
+							<param dst="c:\testframework\bctypeattrib.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bctypeattrib (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\BCTypeAttrib.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bctypeattrib (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="bctypeinfo" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="bctypeinfo" 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="bctypeinfo.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctypeinfo.dll"/>
+							<param dst="c:\sys\bin\bctypeinfo.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrttypei.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrttypei.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bctypeinfo.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/bctypeinfo.cfg"/>
+							<param dst="c:\testframework\bctypeinfo.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="bctypeinfo (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\BCTypeInfo.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="bctypeinfo (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="chartypes" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="chartypes" 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="chartypes.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="chartypes.dll"/>
+							<param dst="c:\sys\bin\chartypes.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_ct.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_ct.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="chartypes (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule chartypes"/>
+							<param result-file="c:\spd_logs\xml\chartypes.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="chartypes (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="tmath_operations" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="tmath_operations" 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="tmath_operations.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tmath_operations.dll"/>
+							<param dst="c:\sys\bin\tmath_operations.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrtmath.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrtmath.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tmath_operations.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tmath_operations.cfg"/>
+							<param dst="c:\testframework\tmath_operations.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tmath_operations (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\tmath_operations.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tmath_operations (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="tmemory" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="tmemory" 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="tmemory.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tmemory.dll"/>
+							<param dst="c:\sys\bin\tmemory.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrtmem.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrtmem.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tmemory.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tmemory.cfg"/>
+							<param dst="c:\testframework\tmemory.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tmemory (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\tmemory.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tmemory (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="tutility" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="tutility" 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="tutility.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tutility.dll"/>
+							<param dst="c:\sys\bin\tutility.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_mrtutil.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_mrtutil.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tutility.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tutility.cfg"/>
+							<param dst="c:\testframework\tutility.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tutility (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\tutility.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tutility (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="widecharclassapibctest" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="widecharclassapibctest" 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="widecharclassapibctest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="widecharclassapibctest.dll"/>
+							<param dst="c:\sys\bin\widecharclassapibctest.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_wc.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_wc.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="widecharclassapibctest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule widecharclassapiBCTest"/>
+							<param result-file="c:\spd_logs\xml\widecharclassapibctest.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="widecharclassapibctest (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="tstl" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="tstl" 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="tstl_1.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tstl_1.dll"/>
+							<param dst="c:\sys\bin\tstl_1.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_tstl_1.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_tstl_1.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tstl_1.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tstl_1.cfg"/>
+							<param dst="c:\testframework\tstl_1.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tstl_1 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\tstl_1.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tstl_1 (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+			<set id="" name="tlocale" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="tlocale" 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="tlocale.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tlocale.dll"/>
+							<param dst="c:\sys\bin\tlocale.dll"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="testframework_tlocale.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_tlocale.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tlocale.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tlocale.cfg"/>
+							<param dst="c:\testframework\tlocale.cfg"/>
+							<param component-path="stdcpptest" />
+						</params>
+					</step>
+					<step id="" name="tlocale (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\tlocale.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tlocale (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>stdcpptest/winscw_udeb/bccppwrap.dll</file>
+		<file>stdcpptest/winscw_udeb/bccsruntimesup.dll</file>
+		<file>stdcpptest/winscw_udeb/bcexception.dll</file>
+		<file>stdcpptest/winscw_udeb/bcnonamespace.dll</file>
+		<file>stdcpptest/winscw_udeb/bcopencheaders.dll</file>
+		<file>stdcpptest/winscw_udeb/bcopencwrap.dll</file>
+		<file>stdcpptest/winscw_udeb/bcthread.dll</file>
+		<file>stdcpptest/winscw_udeb/bctypeattrib.dll</file>
+		<file>stdcpptest/winscw_udeb/bctypeinfo.dll</file>
+		<file>stdcpptest/winscw_udeb/chartypes.dll</file>
+		<file>stdcpptest/winscw_udeb/tmath_operations.dll</file>
+		<file>stdcpptest/winscw_udeb/tmemory.dll</file>
+		<file>stdcpptest/winscw_udeb/tutility.dll</file>
+		<file>stdcpptest/winscw_udeb/widecharclassapibctest.dll</file>
+		<file>stdcpptest/winscw_udeb/tstl_1.dll</file>
+		<file>stdcpptest/winscw_udeb/tlocale.dll</file>
+		<file>stdcpptest/general/testframework/testframework_cppwrap.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtruntime.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtexp.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtnons.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtopench.ini</file>
+		<file>stdcpptest/general/testframework/testframework_ocw.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtthread.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrttypea.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrttypei.ini</file>
+		<file>stdcpptest/general/testframework/testframework_ct.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtmath.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtmem.ini</file>
+		<file>stdcpptest/general/testframework/testframework_mrtutil.ini</file>
+		<file>stdcpptest/general/testframework/testframework_wc.ini</file>
+		<file>stdcpptest/general/testframework/testframework_tstl_1.ini</file>
+		<file>stdcpptest/general/testframework/testframework_tlocale.ini</file>
+		<file>stdcpptest/general/testframework/bccppwrap.cfg</file>
+		<file>stdcpptest/general/testframework/bccsruntimesup.cfg</file>
+		<file>stdcpptest/general/testframework/bcexception.cfg</file>
+		<file>stdcpptest/general/testframework/bcnonamespace.cfg</file>
+		<file>stdcpptest/general/testframework/bcopencheaders.cfg</file>
+		<file>stdcpptest/general/testframework/bcopencwrap.cfg</file>
+		<file>stdcpptest/general/testframework/bcthread.cfg</file>
+		<file>stdcpptest/general/testframework/bctypeattrib.cfg</file>
+		<file>stdcpptest/general/testframework/bctypeinfo.cfg</file>
+		<file>stdcpptest/general/testframework/tmath_operations.cfg</file>
+		<file>stdcpptest/general/testframework/tmemory.cfg</file>
+		<file>stdcpptest/general/testframework/tutility.cfg</file>
+		<file>stdcpptest/general/testframework/tstl_1.cfg</file>
+		<file>stdcpptest/general/testframework/tlocale.cfg</file>
+	</files>
+</test>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/tlocale/tlocale.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/tlocale/tlocale.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for TLocale BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "tlocaletest.zip";
+rmtree "temp";
+mkpath "temp/tlocaletest/general/testframework";
+mkpath "temp/tlocaletest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("tlocale.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/tlocale.dll",						"temp/tlocaletest/winscw_udeb/tlocale.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_tlocale.ini",	"temp/tlocaletest/general/testframework/testframework_tlocale.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tlocale.cfg",					"temp/tlocaletest/general/testframework/tlocale.cfg") or die "failed : $!";
+
+system("7z a -tzip tlocaletest.zip ./temp/*");
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/tlocale/tlocale.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/tlocale/tlocale.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>TLocale BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="TLocale BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="TLocale Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="tlocale" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="tlocale" 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="tlocale.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tlocale.dll"/>
+							<param dst="c:\sys\bin\tlocale.dll"/>
+							<param component-path="tlocaletest" />
+						</params>
+					</step>
+					<step id="" name="testframework_tlocale.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_tlocale.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="tlocaletest" />
+						</params>
+					</step>
+					<step id="" name="tlocale.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tlocale.cfg"/>
+							<param dst="c:\testframework\tlocale.cfg"/>
+							<param component-path="tlocaletest" />
+						</params>
+					</step>
+					<step id="" name="tlocale (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\tlocale.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tlocale (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>tlocaletest/winscw_udeb/tlocale.dll</file>
+		<file>tlocaletest/general/testframework/testframework_tlocale.ini</file>
+		<file>tlocaletest/general/testframework/tlocale.cfg</file>
+	</files>
+</test>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/tstl/tstl.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/tstl/tstl.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Thread Safe Template Library BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "tstltest.zip";
+rmtree "temp";
+mkpath "temp/tstltest/general/testframework";
+mkpath "temp/tstltest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("tstl.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/tstl_1.dll",						"temp/tstltest/winscw_udeb/tstl_1.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_tstl_1.ini",	"temp/tstltest/general/testframework/testframework_tstl_1.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tstl_1.cfg",					"temp/tstltest/general/testframework/tstl_1.cfg") or die "failed : $!";
+
+system("7z a -tzip tstltest.zip ./temp/*");
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/ats/bctest/tstl/tstl.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/tstl/tstl.xml	Mon Oct 19 11:49:45 2009 +0100
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>Thread Safe Template Library BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Thread Safe Template Library BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Thread Safe Template Library Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="tstl" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="tstl" 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="tstl_1.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tstl_1.dll"/>
+							<param dst="c:\sys\bin\tstl_1.dll"/>
+							<param component-path="tstltest" />
+						</params>
+					</step>
+					<step id="" name="testframework_tstl_1.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_tstl_1.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="tstltest" />
+						</params>
+					</step>
+					<step id="" name="tstl_1.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tstl_1.cfg"/>
+							<param dst="c:\testframework\tstl_1.cfg"/>
+							<param component-path="tstltest" />
+						</params>
+					</step>
+					<step id="" name="tstl_1 (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config C:\TestFramework\tstl_1.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tstl_1 (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>tstltest/winscw_udeb/tstl_1.dll</file>
+		<file>tstltest/general/testframework/testframework_tstl_1.ini</file>
+		<file>tstltest/general/testframework/tstl_1.cfg</file>
+	</files>
+</test>
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/brag/raptorToBRAG.pl
--- a/common/tools/brag/raptorToBRAG.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/brag/raptorToBRAG.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -16,6 +16,9 @@
 
 use strict;
 
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
 use Getopt::Long;
 use Text::CSV;
 
diff -r 5fac205a712c -r a7fa60f12ba2 common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Thu Oct 15 18:58:09 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Mon Oct 19 11:49:45 2009 +0100
@@ -123,12 +123,13 @@
 	{
 		# RnD repository
 		my $licenseType = $1;
-		my $name="bin_$1_$2";
+		my $binName="bin_$1_$2";
+		my $srcName="src_$1_$2";
 		my $postbuildName = "binaries_$2";
 		my $config = "rnd";
 		if ($licenseType eq "internal")
 		{
-			$name = "binaries_$2_prebuild";
+			$binName = "binaries_$2_prebuild";
 			$config = "rnd-internal";
 		}
 		
@@ -143,11 +144,15 @@
 				},
 				{
 					name => "name",
-					value=> "$name",
+					value=> "$binName",
 				},
 				{
 					name => "include",
-					value=> "/**",
+					value=> "epoc32/**",
+				},
+				{
+					name => "include",
+					value=> "*.txt",
 				},
 			]
 		};
@@ -156,10 +161,48 @@
 		my @files = `dir /b/s/a-d $dosCompatibleDst 2> nul:`;
 		next unless @files;
 		# Add the files to the global list of items to be excluded in the binary zips
-		@files = grep {
+		foreach (@files)
+		{
 			chomp;
 			s{\\}{/}g;
 			s!^[A-Z]:/$package->{dst}/!!i;
+		}
+		my @srcFiles = grep { !m{^epoc32/} and !m{^[^/]+\.txt$}i and !m{^\.hg} } @files;
+		if (@srcFiles)
+		{
+			# Create a zip object for the source
+			push @{$zipConfig->{config}->{config}->{$config}->{config}},
+			{
+				set =>
+				[
+					{
+						name => "root.dir",
+						value=> "\${build.drive}/$package->{dst}",
+					},
+					{
+						name => "name",
+						value=> "$srcName",
+					},
+					{
+						name => "include",
+						value=> "**",
+					},
+					{
+						name => "exclude",
+						value=> "epoc32/**",
+					},
+					{
+						name => "exclude",
+						value=> ".hg/**",
+					},
+					{
+						name => "exclude",
+						value=> ".hg_archival.txt",
+					},
+				]
+			};
+		}
+		@files = grep {
 			m{^epoc32/}i;
 		} @files;
 		push @allRndFiles, @files;