--- a/common/build.test.xml Wed Apr 28 15:19:18 2010 +0100
+++ b/common/build.test.xml Tue May 04 01:04:57 2010 +0100
@@ -155,22 +155,47 @@
<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}"/>
- </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_tef"/>
+ <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>
<!-- Sending testdrop to ATS3 -->
<target name="sf-send-testpkg" depends="sf-start-ats,sf-find-ATS-worker-root,sf-make-junction">
+ <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"/>
+ </then>
+ </if>
<mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>
<echo message="Sending test package ${sf.spec.test.package.name} to ${sf.spec.test.host.name} path ${sf.spec.test.host.droppath}"/>
<exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_testdrop.log">
@@ -183,9 +208,14 @@
<arg value="--host-drop-path=${sf.spec.test.host.droppath}"/>
</exec>
</target>
- <target name="sf-start-ats">
- <exec executable="start.cmd" dir="${ats.drive}" spawn="true" failonerror="false"/>
- <echo message="Waiting for 10 seconds to start the ATS Worker......."/>
- <sleep seconds="10"/>
+
+ <target name="sf-start-ats">
+ <if><available file="${ats.drive}/start.cmd"/>
+ <then>
+ <exec executable="start.cmd" dir="${ats.drive}" spawn="true" failonerror="false"/>
+ <echo message="Waiting for 10 seconds to start the ATS Worker......."/>
+ <sleep seconds="10"/>
+ </then>
+ </if>
</target>
</project>