Introduced new helium properties (sf.spec.test.image.location and sf.spec.test.image.name)
authorMaciej Seroka <maciejs@symbian.org>
Fri, 03 Sep 2010 10:28:57 +0100
changeset 1214 85da5566bcbb
parent 1213 421d0e717095
child 1215 311e0398c886
Introduced new helium properties (sf.spec.test.image.location and sf.spec.test.image.name)
common/build.test.xml
common/common_props.ant.xml
--- a/common/build.test.xml	Thu Sep 02 14:53:02 2010 +0100
+++ b/common/build.test.xml	Fri Sep 03 10:28:57 2010 +0100
@@ -193,7 +193,7 @@
           <arg value="--publish=${publish.dir}\ats_reports"/>
           <arg value="--bld-drive=${build.drive}"/>
           <arg value="--test-target=${sf.spec.test.target}"/>
-          <arg value="--image-path=${sf.spec.test.imagepath}"/>
+          <arg value="--image-path=${sf.spec.test.image.location}\${sf.spec.test.image.name}"/>
           <arg value="--ats-version=${sf.spec.ats.version}"/>
         </exec>
 
@@ -206,7 +206,7 @@
         <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
           <then>
             <delete file="${sf.spec.test.workerroot}/syborg.dtb" quiet="true"/>
-            <copy file="${build.drive}/epoc32/rom/syborg/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/>
+            <copy file="${sf.spec.test.image.location}/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/>
           </then>
         </if>
         <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>
--- a/common/common_props.ant.xml	Thu Sep 02 14:53:02 2010 +0100
+++ b/common/common_props.ant.xml	Fri Sep 03 10:28:57 2010 +0100
@@ -111,7 +111,8 @@
     <property name="sf.spec.test.host.droppath"  value="D:\ats3_testdrop_arrivals\${env.COMPUTERNAME}"/>
     <property name="sf.spec.test.epocroot"       value="winscw_smoketest"/>
     <property name="sf.spec.test.target"         value="winscw"/> <!-- This specifies the target on which tests will be run -->
-    <property name="sf.spec.test.imagepath"      value="D:\epoc32\rom\syborg_tshell_ARMV5_udeb.img"/> <!-- This specifies the path to the ROM image used for testing -->
+    <property name="sf.spec.test.image.location" value="D:\epoc32\rom"/> <!-- This specifies the location of the ROM image used for testing -->
+    <property name="sf.spec.test.image.name"     value="syborg_tshell_ARMV5_urel.img"/> <!-- This specifies the name of the ROM image used for testing -->
 
     <!-- ATS properties -->
     <property name="sf.spec.test.package.location"  value="\\${sf.spec.test.host.name}\ats3_testdrop_arrivals\${env.COMPUTERNAME}"/>