--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml Wed Sep 01 14:00:09 2010 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml Thu Sep 02 12:43:31 2010 +0100
@@ -14,6 +14,7 @@
<target>
<device rank="master" alias="emulator_udeb">
<property name="HARNESS" value="ATSINTERFACE" />
+ <property name="TYPE" value="WINSCW" />
</device>
</target>
<plan id="" name="Contacts Phonebook BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -934,7 +935,7 @@
<command>execute</command>
<params>
<param file="atsinterface.exe"/>
- <param parameters="-testmodule testcombiner -config C:\TestFramework\tcspeeddial.cfg -engineini C:\TestFramework\testframework_spdial.ini"/>
+ <param parameters="-testmodule testcombiner -config C:\TestFramework\tcspeeddial.cfg -engineini C:\TestFramework\testframework.ini"/>
<param result-file="c:\spd_logs\xml\testcombiner.xml"/>
<param timeout="900"/>
</params>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/ipconnmgmt/connset/README.txt Thu Sep 02 12:43:31 2010 +0100
@@ -0,0 +1,1 @@
+This replaced the old connset bc test suite (1 Sep 2010).
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/ipconnmgmt/connset/cmmgrbc.pl Thu Sep 02 12:43:31 2010 +0100
@@ -0,0 +1,33 @@
+#!/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 "cmmgrbctest.zip";
+rmtree "temp";
+mkpath "temp/cmmgrbctest/general/testframework";
+mkpath "temp/cmmgrbctest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("cmmgrbc.xml", "temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/cmmgrbc.dll", "temp/cmmgrbctest/winscw_udeb/cmmgrbc.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_cmmgrbc.ini", "temp/cmmgrbctest/general/testframework/testframework_cmmgrbc.ini") or die "failed : $!";
+
+system("7z a -tzip cmmgrbctest.zip ./temp/*");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/ipconnmgmt/connset/cmmgrbc.xml Thu Sep 02 12:43:31 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<test>
+ <id>1</id>
+ <owner>admin</owner>
+ <priority>10</priority>
+ <buildid></buildid>
+ <postAction>
+ <type>FileStoreAction</type>
+ <params>
+ <param name="report-type" value="ATS3_REPORT"/>
+ </params>
+ </postAction>
+ <name>Connection Settings BC Tests</name>
+ <target>
+ <device rank="master" alias="emulator_udeb">
+ <property name="HARNESS" value="ATSINTERFACE" />
+ <property name="TYPE" value="WINSCW" />
+ </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="connection_settings_api" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <case id="" name="connection_settings_api" 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="cmmgrbc.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="binary"/>
+ <param src="cmmgrbc.dll"/>
+ <param dst="c:\sys\bin\cmmgrbc.dll"/>
+ <param component-path="cmmgrbctest" />
+ </params>
+ </step>
+ <step id="" name="testframework_cmmgrbc.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="data"/>
+ <param src="testframework/testframework_cmmgrbc.ini"/>
+ <param dst="c:\testframework\testframework.ini"/>
+ <param component-path="cmmgrbctest" />
+ </params>
+ </step>
+ <step id="" name="cmmgrbc (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>execute</command>
+ <params>
+ <param file="atsinterface.exe"/>
+ <param parameters="-testmodule cmmgrbc"/>
+ <param result-file="c:\spd_logs\xml\cmmgrbc.xml"/>
+ <param timeout="3600"/>
+ </params>
+ </step>
+ <step id="" name="cmmgrbc (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>cmmgrbctest/winscw_udeb/cmmgrbc.dll</file>
+ <file>cmmgrbctest/general/testframework/testframework_cmmgrbc.ini</file>
+ </files>
+</test>
--- a/common/tools/split_sysdef.pl Wed Sep 01 14:00:09 2010 +0100
+++ b/common/tools/split_sysdef.pl Thu Sep 02 12:43:31 2010 +0100
@@ -56,7 +56,7 @@
$bldfile =~ s,\\,/,g;
$bldfile = "/$bldfile" if ( $bldfile !~ m,^/, );
$bldfile = "/sf$bldfile" if ( $bldfile !~ m,^/sf, );
- if ($bldfile =~ m,^/sf/(os|mw|app|tools|ostools|adaptation)/,)
+ if ($bldfile =~ m,^/sf/(os|mw|app|tools|ostools|adaptation|adapt)/,)
{
$unit->setAttribute("bldFile", $bldfile);
}
@@ -72,7 +72,7 @@
$mrp =~ s,\\,/,g;
$mrp = "/$mrp" if ( $mrp !~ m,^/, );
$mrp = "/sf$mrp" if ( $mrp !~ m,^/sf, );
- if ($mrp =~ m,^/sf/(os|mw|app|tools|ostools|adaptation)/,)
+ if ($mrp =~ m,^/sf/(os|mw|app|tools|ostools|adaptation|adapt)/,)
{
$unit->setAttribute("mrp", $mrp);
}
--- a/sf-platform/build.xml Wed Sep 01 14:00:09 2010 +0100
+++ b/sf-platform/build.xml Thu Sep 02 12:43:31 2010 +0100
@@ -129,8 +129,8 @@
<replaceregex pattern="mrp="app" replace="mrp="/sf/app" flags="gi"/>
<replaceregex pattern="bldFile="tools" replace="bldFile="/sf/tools" flags="gi"/>
<replaceregex pattern="mrp="tools" replace="mrp="/sf/tools" flags="gi"/>
- <replaceregex pattern="bldFile="adaptation" replace="bldFile="/sf/adaptation" flags="gi"/>
- <replaceregex pattern="mrp="adaptation" replace="mrp="/sf/adaptation" flags="gi"/>
+ <replaceregex pattern="bldFile="adapt" replace="bldFile="/sf/adapt" flags="gi"/>
+ <replaceregex pattern="mrp="adapt" replace="mrp="/sf/adapt" flags="gi"/>
<expandproperties/>
</filterchain>
</copy>