catchup merge.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/coretelephony/coretelephony.pl Tue Oct 20 19:29:07 2009 +0100
@@ -0,0 +1,31 @@
+#!/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:
+# Brendan Donegan <brendand@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for BC RTC Core Telephony tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "coretelephony.zip";
+rmtree "temp";
+mkpath "temp/rtcct/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("coretelephony.xml", "temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/BCLogEngineTest.dll", "temp/rtcct/winscw_udeb/BCLogEngineTest.dll") or die "failed : $!";
+
+system("7z a -tzip coretelephony.zip ./temp/*");
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/coretelephony/coretelephony.xml Tue Oct 20 19:29:07 2009 +0100
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<test>
+ <id>1</id>
+ <owner>admin</owner>
+ <priority>10</priority>
+ <buildid></buildid>
+ <name>RTC Core Telephony BC Tests</name>
+ <target>
+ <device rank="master" alias="emulator_udeb">
+ <property name="HARNESS" value="ATSINTERFACE" />
+ </device>
+ </target>
+ <plan id="" name="RTC Core Telephony BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <target>
+ <device rank="master" alias="emulator_udeb"/>
+ </target>
+ <session id="" name="RTC Core Telephony Binary Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <set id="" name="RTC Core Telephony" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <case id="" name="Core Telephony Log Engine 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="BCLogEngineTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="binary"/>
+ <param src="BCLogEngineTest.dll"/>
+ <param dst="c:\sys\bin\BCLogEngineTest.dll"/>
+ <param component-path="rtcct" />
+ </params>
+ </step>
+ <step id="" name="BCLogEngineTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>execute</command>
+ <params>
+ <param file="atsinterface.exe"/>
+ <param parameters="-testmodule BCLogEngineTest"/>
+ <param result-file="c:\spd_logs\xml\BCLogEngineTest.xml"/>
+ <param timeout="3600"/>
+ </params>
+ </step>
+ <step id="" name="BCLogEngineTest (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>rtcct/winscw_udeb/BCLogEngineTest.dll</file>
+ </files>
+</test>
\ No newline at end of file
--- a/common/tools/ats/bctest/websrv/websrv.pl Tue Oct 20 11:03:02 2009 +0100
+++ b/common/tools/ats/bctest/websrv/websrv.pl Tue Oct 20 19:29:07 2009 +0100
@@ -21,18 +21,26 @@
use File::Path;
unlink "websrv.zip";
-##rmtree "temp";
+rmtree "temp";
mkpath "temp/bcwebsrv/general/testframework";
mkpath "temp/bcwebsrv/winscw_udeb";
my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
copy("websrv.xml", "temp/test.xml");
-copy($epoc . "release/winscw/udeb/CSenServiceConnectionBCTest.dll", "temp/bcwebsrv/winscw_udeb/CSenServiceConnectionBCTest.dll");
-copy($epoc . "winscw/c/testframework/testframework_connection.ini", "temp/bcwebsrv/general/testframework/testframework_connection.ini");
-copy($epoc . "release/winscw/udeb/HostletConnectionBCTest.dll", "temp/bcwebsrv/winscw_udeb/HostletConnectionBCTest.dll");
-copy($epoc . "winscw/c/testframework/TestFramework_hostlet.ini", "temp/bcwebsrv/general/testframework/TestFramework_hostlet.ini");
-copy($epoc . "release/winscw/udeb/newsoapclassesbctest.dll", "temp/bcwebsrv/winscw_udeb/newsoapclassesbctest.dll");
-copy($epoc . "winscw/c/testframework/testframework_newsoapclasses.ini", "temp/bcwebsrv/general/testframework/testframework_newsoapclasses.ini");
+copy($epoc . "release/winscw/udeb/CSenServiceConnectionBCTest.dll", "temp/bcwebsrv/winscw_udeb/CSenServiceConnectionBCTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_connection.ini", "temp/bcwebsrv/general/testframework/testframework_connection.ini") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/HostletConnectionBCTest.dll", "temp/bcwebsrv/winscw_udeb/HostletConnectionBCTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_hostlet.ini", "temp/bcwebsrv/general/testframework/TestFramework_hostlet.ini") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/newsoapclassesbctest.dll", "temp/bcwebsrv/winscw_udeb/newsoapclassesbctest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_newsoapclasses.ini", "temp/bcwebsrv/general/testframework/testframework_newsoapclasses.ini") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/SenServDescBCTest.dll", "temp/bcwebsrv/winscw_udeb/SenServDescBCTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_senservdesc.ini", "temp/bcwebsrv/general/testframework/testframework_senservdesc.ini") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/SenServiceManagerBCTest.dll", "temp/bcwebsrv/winscw_udeb/SenServiceManagerBCTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_senservicemanager.ini", "temp/bcwebsrv/general/testframework/testframework_senservicemanager.ini") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/SenUtilsBCTest.dll", "temp/bcwebsrv/winscw_udeb/SenUtilsBCTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_senutils.ini", "temp/bcwebsrv/general/testframework/testframework_senutils.ini") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/SenFragmentBCTest.dll", "temp/bcwebsrv/winscw_udeb/SenFragmentBCTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_senfragment.ini", "temp/bcwebsrv/general/testframework/TestFramework_senfragment.ini") or die "failed : $!";
system("7z a -tzip websrv.zip ./temp/*");
\ No newline at end of file
--- a/common/tools/ats/bctest/websrv/websrv.xml Tue Oct 20 11:03:02 2009 +0100
+++ b/common/tools/ats/bctest/websrv/websrv.xml Tue Oct 20 19:29:07 2009 +0100
@@ -15,8 +15,8 @@
<device rank="master" alias="emulator_udeb"/>
</target>
<session id="" name="Web Services Binary Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
- <set id="" name="Web Service Connection" harness="ATSINTERFACE" enabled="true" passrate="100">
- <case id="" name="Connection API" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <set id="" name="Web Services" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <case id="" name="Web Service Connection 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>
@@ -57,8 +57,6 @@
</params>
</step>
</case>
- </set>
- <set id="" name="Hostlet Connection" harness="ATSINTERFACE" enabled="true" passrate="100">
<case id="" name="Hostlet Connection 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>
@@ -100,8 +98,6 @@
</params>
</step>
</case>
- </set>
- <set id="" name="Web Service Messaging" harness="ATSINTERFACE" enabled="true" passrate="100">
<case id="" name="New SOAP Classes 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>
@@ -143,6 +139,170 @@
</params>
</step>
</case>
+ <case id="" name="Web Service Description 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="SenServDescBCTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="binary"/>
+ <param src="SenServDescBCTest.dll"/>
+ <param dst="c:\sys\bin\SenServDescBCTest.dll"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="testframework_senservdesc.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="data"/>
+ <param src="testframework\testframework_senservdesc.ini"/>
+ <param dst="c:\testframework\testframework_senservdesc.ini"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="SenServDescBCTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>execute</command>
+ <params>
+ <param file="atsinterface.exe"/>
+ <param parameters="-testmodule SenServDescBCTest"/>
+ <param result-file="c:\spd_logs\xml\SenServDescBCTest.xml"/>
+ <param timeout="3600"/>
+ </params>
+ </step>
+ <step id="" name="SenServDescBCTest (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="Web Service Manager 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="SenServiceManagerBCTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="binary"/>
+ <param src="SenServiceManagerBCTest.dll"/>
+ <param dst="c:\sys\bin\SenServiceManagerBCTest.dll"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="testframework_senservicemanager.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="data"/>
+ <param src="testframework\testframework_senservicemanager.ini"/>
+ <param dst="c:\testframework\testframework_senservicemanager.ini"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="SenServiceManagerBCTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>execute</command>
+ <params>
+ <param file="atsinterface.exe"/>
+ <param parameters="-testmodule SenServiceManagerBCTest"/>
+ <param result-file="c:\spd_logs\xml\SenServiceManagerBCTest.xml"/>
+ <param timeout="3600"/>
+ </params>
+ </step>
+ <step id="" name="SenServiceManagerBCTest (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="Web Service Messaging Utils 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="SenUtilsBCTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="binary"/>
+ <param src="SenUtilsBCTest.dll"/>
+ <param dst="c:\sys\bin\SenUtilsBCTest.dll"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="testframework_senutils.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="data"/>
+ <param src="testframework\testframework_senutils.ini"/>
+ <param dst="c:\testframework\testframework_senutils.ini"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="SenUtilsBCTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>execute</command>
+ <params>
+ <param file="atsinterface.exe"/>
+ <param parameters="-testmodule SenUtilsBCTest"/>
+ <param result-file="c:\spd_logs\xml\SenUtilsBCTest.xml"/>
+ <param timeout="3600"/>
+ </params>
+ </step>
+ <step id="" name="SenUtilsBCTest (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="Web Service Fragment 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="SenFragmentBCTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="binary"/>
+ <param src="SenFragmentBCTest.dll"/>
+ <param dst="c:\sys\bin\SenFragmentBCTest.dll"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="TestFramework_senfragment.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="data"/>
+ <param src="testframework\TestFramework_senfragment.ini"/>
+ <param dst="c:\testframework\TestFramework_senfragment.ini"/>
+ <param component-path="bcwebsrv" />
+ </params>
+ </step>
+ <step id="" name="SenFragmentBCTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>execute</command>
+ <params>
+ <param file="atsinterface.exe"/>
+ <param parameters="-testmodule SenFragmentBCTest"/>
+ <param result-file="c:\spd_logs\xml\SenFragmentBCTest.xml"/>
+ <param timeout="3600"/>
+ </params>
+ </step>
+ <step id="" name="SenFragmentBCTest (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>
@@ -153,5 +313,13 @@
<file>bcwebsrv/general/testframework/testframework_hostlet.ini</file>
<file>bcwebsrv/winscw_udeb/newsoapclassesbctest.dll</file>
<file>bcwebsrv/general/testframework/testframework_newsoapclasses.ini</file>
+ <file>bcwebsrv/winscw_udeb/SenServDescBCTest.dll</file>
+ <file>bcwebsrv/general/testframework/testframework_senservdesc.ini</file>
+ <file>bcwebsrv/winscw_udeb/SenServiceManagerBCTest.dll</file>
+ <file>bcwebsrv/general/testframework/testframework_senservicemanager.ini</file>
+ <file>bcwebsrv/winscw_udeb/SenUtilsBCTest.dll</file>
+ <file>bcwebsrv/general/testframework/testframework_senutils.ini</file>
+ <file>bcwebsrv/winscw_udeb/SenFragmentBCTest.dll</file>
+ <file>bcwebsrv/general/testframework/TestFramework_senfragment.ini</file>
</files>
</test>
\ No newline at end of file
--- a/sf-platform/build.xml Tue Oct 20 11:03:02 2009 +0100
+++ b/sf-platform/build.xml Tue Oct 20 19:29:07 2009 +0100
@@ -64,7 +64,8 @@
</exec>
</sequential>
</for>
- <copy todir="${build.drive}/epoc32/tools/makefile_templates/s60">
+ <!-- needed for s^2 but not s^3 - so ignore if not present -->
+ <copy todir="${build.drive}/epoc32/tools/makefile_templates/s60" failonerror="false">
<fileset dir="${build.drive}/sf/tools/makefile_templates">
<exclude name=".hg*"/>
<exclude name=".hg/**"/>