--- a/common/build.test.xml	Wed Jun 09 14:57:01 2010 +0100
+++ b/common/build.test.xml	Fri Jun 11 09:20:11 2010 +0100
@@ -157,33 +157,20 @@
         
         <echo message="INFO Updating smoketest package with test info"/>
 
-        <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="--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>
+        <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=${sf.spec.test.target}"/>
+          <arg value="--image-path=${sf.spec.test.imagepath}"/>
+          <arg value="--ats-version=${sf.spec.ats.version}"/>
+        </exec>
+
         <!-- Now ready to send to ATS3 -->
     </target>