# HG changeset patch
# User Brendan Donegan <brendand@symbian.org>
# Date 1276851642 -3600
# Node ID a7888304ad191782678934e86f5e1cf755b0948c
# Parent  e5ad616daedbe8baac29d607cdf9292e6a73a891
Added Qt tests to the test plan

diff -r e5ad616daedb -r a7888304ad19 Group/smoketest.pl
--- a/Group/smoketest.pl	Thu Jun 17 09:20:54 2010 +0100
+++ b/Group/smoketest.pl	Fri Jun 18 10:00:42 2010 +0100
@@ -201,6 +201,10 @@
 	copy($epoc . "data/c/smoketest/web/img8.jpg",						"temp/smoketest/web/general/img8.jpg");
 	copy($epoc . "winscw/c/smoketest/ui_browser_control_smoke.cfg",   	"temp/smoketest/general/ui_browser_control_smoke.cfg");
 	copy($epoc . "release/winscw/udeb/BrCtlApiTest.dll",				"temp/smoketest/winscw_udeb/BrCtlApiTest.dll");
+	
+	copy($epoc . "release/winscw/udeb/tst_smoke_qapplication.exe",		"temp/smoketest/winscw_udeb/tst_smoke_qapplication.exe");
+	copy($epoc . "release/winscw/udeb/tst_smoke_qwidget.exe",			"temp/smoketest/winscw_udeb/tst_smoke_qwidget.exe");
+	copy($epoc . "release/winscw/udeb/tst_smoke_qtgestures.exe",		"temp/smoketest/winscw_udeb/tst_smoke_qtgestures.exe");
 }
 elsif ($target eq "SYBORG") { # Build ATS test drop for Syborg.
 	if (lc($ats_version) eq "ats3") { copy("smoketest_syborg.xml",		"temp/test.xml"); } # Use ATS3 test plan.
diff -r e5ad616daedb -r a7888304ad19 Group/smoketest.xml
--- a/Group/smoketest.xml	Thu Jun 17 09:20:54 2010 +0100
+++ b/Group/smoketest.xml	Fri Jun 18 10:00:42 2010 +0100
@@ -857,6 +857,72 @@
 						</params>
 					</step>
 				</case>
+				<case id="" name="Qt Application Smoke Test" harness="GENERIC" enabled="true" passrate="100">
+						<step id="" name="tst_smoke_qapplication (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tst_smoke_qapplication.exe"/>
+							<param dst="c:\sys\bin\tst_smoke_qapplication.exe"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+					<step id="" name="tst_smoke_qapplication (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
+						<command>execute</command>
+						<params>
+							<param file="tst_smoke_qapplication.exe"/>
+							<param parameters="-lightxml -o c:\logs\tst_smoke_qapplication.xml"/>
+							<param result-file="c:\logs\tst_smoke_qapplication.xml"/>
+							<param timeout="1200"/>
+							<param parser="QTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+					</step>
+				</case>
+				<case id="" name="Qt Widget Smoke Test" harness="GENERIC" enabled="true" passrate="100">
+						<step id="" name="tst_smoke_qwidget (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tst_smoke_qwidget.exe"/>
+							<param dst="c:\sys\bin\tst_smoke_qwidget.exe"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+					<step id="" name="tst_smoke_qwidget (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
+						<command>execute</command>
+						<params>
+							<param file="tst_smoke_qwidget.exe"/>
+							<param parameters="-lightxml -o c:\logs\tst_smoke_qwidget.xml"/>
+							<param result-file="c:\logs\tst_smoke_qwidget.xml"/>
+							<param timeout="1200"/>
+							<param parser="QTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+					</step>
+				</case>
+				<case id="" name="Qt Gestures Smoke Test" harness="GENERIC" enabled="true" passrate="100">
+						<step id="" name="tst_smoke_qtgestures (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="tst_smoke_qtgestures.exe"/>
+							<param dst="c:\sys\bin\tst_smoke_qtgestures.exe"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+					<step id="" name="tst_smoke_qtgestures (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
+						<command>execute</command>
+						<params>
+							<param file="tst_smoke_qtgestures.exe"/>
+							<param parameters="-lightxml -o c:\logs\tst_smoke_qtgestures.xml"/>
+							<param result-file="c:\logs\tst_smoke_qtgestures.xml"/>
+							<param timeout="1200"/>
+							<param parser="QTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+					</step>
+				</case>
 			</set>
             <set id="" name="ATSINTERFACE smoke tests" harness="ATSINTERFACE" enabled="true" passrate="100">
                 <target>
@@ -1121,7 +1187,7 @@
 							<param timeout="1500"/>
 						</params>
 					</step>
-					<step id="" name="MediaMgmtSmokeTestModule (execute)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="true">
+					<step id="" name="MediaMgmtSmokeTestModule (execute)" harness="ATSINTERFACE" enabled="false" passrate="100" significant="true">
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
@@ -1200,5 +1266,9 @@
 		<file>smoketest/web/general/img8.jpg</file>
 		<file>smoketest/general/ui_browser_control_smoke.cfg</file>
 		<file>smoketest/winscw_udeb/BrCtlApiTest.dll</file>
+		
+		<file>smoketest/winscw_udeb/tst_smoke_qapplication.exe</file>
+		<file>smoketest/winscw_udeb/tst_smoke_qwidget.exe</file>
+		<file>smoketest/winscw_udeb/tst_smoke_qtgestures.exe</file>
 	</files>
 </test>
diff -r e5ad616daedb -r a7888304ad19 package_definition.xml
--- a/package_definition.xml	Thu Jun 17 09:20:54 2010 +0100
+++ b/package_definition.xml	Fri Jun 18 10:00:42 2010 +0100
@@ -79,16 +79,16 @@
       <block name="smoketest" level="test" long-name="Platform Smoketest" levels="tests">
         <collection name="smoketest_collection" long-name="Smoketest Collection" level="test">
 		  <component name="tst_smoke_qtgestures" long-name="Qt Gestures Smoketest">
-            <unit bldFile="qt/gestures/bld.inf" proFile="qt/gestures/smoke_qtgestures.pro" />
+            <unit bldFile="qt/gestures" proFile="qt/gestures/smoke_qtgestures.pro" />
           </component>
           <component name="tst_smoke_qwidget" long-name="Qt Widgets Smoketest">
-            <unit bldFile="qt/qwidget/bld.inf" proFile="qt/qwidget/smoke_qwidget.pro" />
+            <unit bldFile="qt/qwidget" proFile="qt/qwidget/smoke_qwidget.pro" />
           </component>
           <component name="tst_smoke_qapplication" long-name="Qt Application Smoketest">
-            <unit bldFile="qt/qapplication/bld.inf" proFile="qt/qapplication/smoke_qapplication.pro" />
+            <unit bldFile="qt/qapplication" proFile="qt/qapplication/smoke_qapplication.pro" />
           </component>
           <component name="smoketests" long-name="Smoketests">
-            <unit bldFile="Group/bld.inf"/>
+            <unit bldFile="Group"/>
           </component>
         </collection>
       </block>