Fixed: exec doesn't support the nested "if" element
authorMaciej Seroka <maciejs@symbian.org>
Wed, 28 Apr 2010 17:18:05 +0100
changeset 991 73dce18476a0
parent 990 28143a19361e
child 992 64899060ea4d
Fixed: exec doesn't support the nested "if" element
common/build.test.xml
--- a/common/build.test.xml	Wed Apr 28 15:30:20 2010 +0100
+++ b/common/build.test.xml	Wed Apr 28 17:18:05 2010 +0100
@@ -155,22 +155,35 @@
         <copy file="${build.drive}/smoketest/group/smoketest.zip" todir="${sf.spec.test.package.location}"  failonerror="false"/>
         
         <echo message="INFO Updating smoketest package with test info"/>
-        <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
-            <arg value="ats_specialise_test_drop.pl"/>
-            <arg value="--test-drop-name=Smoketest-${build.id}"/> 
-            <arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/>
-            <arg value="--src=${sf.spec.test.package.location}\smoketest.zip"/>
-            <arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>	
-            <arg value="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>	
-            <arg value="--publish=${publish.dir}\ats_reports"/>
-			<arg value="--bld-drive=${build.drive}"/>
-            <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
-              <then>
-                <arg value="--test-target=Syborg_stif"/>
-                <arg value="--image-path=${sf.spec.test.imagepath}"/>
-              </then>
-            </if>
-        </exec>
+
+        <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
+          <then>
+            <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+              <arg value="ats_specialise_test_drop.pl"/>
+              <arg value="--test-drop-name=Smoketest-${build.id}"/> 
+              <arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/>
+              <arg value="--src=${sf.spec.test.package.location}\smoketest.zip"/>
+              <arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>	
+              <arg value="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>	
+              <arg value="--publish=${publish.dir}\ats_reports"/>
+              <arg value="--bld-drive=${build.drive}"/>
+              <arg value="--test-target=Syborg_stif"/>
+              <arg value="--image-path=${sf.spec.test.imagepath}"/>
+            </exec>
+          </then>
+          <else>		
+            <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+              <arg value="ats_specialise_test_drop.pl"/>
+              <arg value="--test-drop-name=Smoketest-${build.id}"/> 
+              <arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/>
+              <arg value="--src=${sf.spec.test.package.location}\smoketest.zip"/>
+              <arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>	
+              <arg value="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>	
+              <arg value="--publish=${publish.dir}\ats_reports"/>
+              <arg value="--bld-drive=${build.drive}"/>
+            </exec>
+          </else>
+        </if>
         <!-- Now ready to send to ATS3 -->
     </target>