catchup merge.
--- a/common/tools/ats/bctest/multimedia/multimediatest.xml Fri Oct 16 19:26:06 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediatest.xml Mon Oct 19 10:29:47 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"/>