# HG changeset patch
# User Brendan Donegan <brendand@symbian.org>
# Date 1276253046 -3600
# Node ID 4f2786c97bf43afff5d031439db719a4e2e0c10c
# Parent  72f7e4177ac7f38f71cb06fdc0e7d038c8e19e45# Parent  2870b072e1082d6a2d57076a6d09142ff8ca732d
Merge

diff -r 72f7e4177ac7 -r 4f2786c97bf4 Group/ats4_smoketest.xml
--- a/Group/ats4_smoketest.xml	Fri Jun 11 11:40:57 2010 +0100
+++ b/Group/ats4_smoketest.xml	Fri Jun 11 11:44:06 2010 +0100
@@ -433,6 +433,16 @@
 				<parameter name="timeout" value="1200" />
 			</parameters>
 		</task>
+		<task agents="target">
+			<type>ExecutableTestCaseTask</type>
+			<parameters>
+				<parameter name="file" value="atsinterface.exe"/>
+				<parameter name="parameters" value="-testmodule testcombiner -config c:\smoketest\MediaMgmtSmokeTestModule.cfg" />
+				<parameter name="parser" value="STIFXMLParser" />
+				<parameter name="result-file" value="c:\spd_logs\xml\testcombiner.xml" />
+				<parameter name="timeout" value="600" />
+			</parameters>
+		</task>
 		<finalization>
 			<task agents="target">
 				<type>FileDownloadTask</type>
diff -r 72f7e4177ac7 -r 4f2786c97bf4 Group/ats4_smoketest_syborg.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Group/ats4_smoketest_syborg.xml	Fri Jun 11 11:44:06 2010 +0100
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<testrun>
+	<metadata>
+		<meta name="name">Smoketest</meta>
+	</metadata>
+	<agents>
+		<agent alias="target">
+			<property name="name" value="MY_AGENT_NAME"/>
+		</agent>
+	</agents>
+	<execution>
+		<initialization>
+			<task agents="target">
+				<type>CreateDirTask</type>
+				<parameters>
+					<parameter name="dir" value="c:\spd_logs\xml" />
+				</parameters>
+			</task>
+		</initialization>
+		<task agents="target">
+			<type>NonTestExecuteTask</type>
+			<parameters>
+				<parameter name="file" value="testexecute.exe"/>
+				<parameter name="parameters" value="z:\smoketest\setup_smoketest_agenda.script" />
+				<parameter name="timeout" value="1200" />
+				<parameter name="local" value="false" />
+			</parameters>
+		</task>
+		<task agents="target">
+			<type>ExecutableTestCaseTask</type>
+			<parameters>
+				<parameter name="file" value="testexecute.exe"/>
+				<parameter name="parameters" value="z:\smoketest\smoketest_agenda.script" />
+				<parameter name="parser" value="TEFResultParser" />
+				<parameter name="result-file" value="c:\logs\testexecute\smoketest_agenda.htm" />
+				<parameter name="timeout" value="1200" />
+			</parameters>
+		</task>
+		<task agents="target">
+			<type>ExecutableTestCaseTask</type>
+			<parameters>
+				<parameter name="file" value="atsinterface.exe"/>
+				<parameter name="parameters" value="-testmodule testscripter -config z:\smoketest\InputMethodSmokeTestModule.cfg" />
+				<parameter name="parser" value="STIFXMLParser" />
+				<parameter name="result-file" value="c:\spd_logs\xml\testscripter.xml" />
+				<parameter name="timeout" value="1200" />
+			</parameters>
+		</task>
+		<finalization>
+			<task agents="target">
+				<type>FileDownloadTask</type>
+				<parameters>
+					<parameter name="src" value="c:\logs\testexecute\*"/>
+					<parameter name="delete" value="true"/>
+				</parameters>
+			</task>
+		</finalization>
+	</execution>
+	<postActions>
+		<action>
+			<type>ReportFormatAction</type>
+			<parameters>
+				<parameter name="format" value="simplelogger" />
+			</parameters>
+		</action>
+		<action>
+			<type>DiamondsAction</type>
+		</action>
+	</postActions>
+</testrun>
\ No newline at end of file