FCL/sftools/dev/build: comparison buildframework/helium/tools/testing/ats/ats.ant.xml

equal deleted inserted replaced

-:85df38eb4012
+:df88fead2976
 <else>
 <property name="ats.drop.location.file" location="${build.output.dir}/ats/${ats.drop.file}" />
 </else>
 </if>
-<!-- Notify ATS about the drop. -->
+<trycatch property="exception">
-<if>
+<try>
-<istrue value="${ats4.enabled}" />
+<!-- Notify ATS about the drop. -->
-<then>
+<if>
-<hlm:python failonerror="true">
+<istrue value="${ats4.enabled}" />
+<then>
+<hlm:python failonerror="true">
 version = r'${java.version}'
 if '1.6.0' in version:
 assert int(version.split('_')[1]) > 6, 'Java 6 u7 required'
 </hlm:python>
 <condition property="ats.import.arg" value="-import" else="">
 <equals arg1="${ats.script.type}" arg2="import" />
 </condition>
 <condition property="ats4.libs" value="${helium.dir}/extensions/nokia/external/ats4" else="${helium.dir}/external/antlibs">
 <available type="dir" file="${helium.dir}/extensions/nokia/external/ats4"/>
 </condition>
 <java classname="com.nokia.ats.util.server.CommandLineClient" fork="true" maxmemory="1024m" failonerror="true">
-<classpath>
-<pathelement path="${java.class.path}"/>
-<fileset dir="${ats4.libs}" includes="*.jar"/>
-</classpath>
-<arg line="-url http://${ats.server}/ServerService -path ${ats.drop.location.file} ${ats.import.arg}"/>
-</java>
-</then>
-<else>
-<if>
-<and>
-<equals arg1="${ats.script.type}" arg2="import" />
-<available classname="com.nokia.taitei.util.TestDropImporter"/>
-</and>
-<then>
-<java classname="com.nokia.taitei.util.TestDropImporter" fork="true" maxmemory="1024m" failonerror="true">
 <classpath>
 <pathelement path="${java.class.path}"/>
+<fileset dir="${ats4.libs}" includes="*.jar"/>
 </classpath>
-<arg line="${ats.server} ${ats.drop.location.file} ${ats.username} ${ats.password}"/>
+<arg line="-url http://${ats.server}/ServerService -path ${ats.drop.location.file} ${ats.import.arg}"/>
 </java>
 </then>
 <else>
-<condition property="ats.wsh.testrun.file" value="wshTestRunImport.vbs" else="wshTestRunX.vbs">
+<if>
-<equals arg1="${ats.script.type}" arg2="import" />
+<and>
-</condition>
+<equals arg1="${ats.script.type}" arg2="import" />
-<exec executable="cscript" dir="${build.drive}/" failonerror="true">
+<available classname="com.nokia.taitei.util.TestDropImporter"/>
-<env key="ats3.username" value="${ats.username}" />
+<not>
-<env key="ats3.password" value="${ats.password}" />
+<istrue value="${ats.disable.java.importer}" />
-<env key="ats3.host" value="${ats.server}" />
+</not>
-<env key="ats3.pathToDrop" value="${ats.drop.location.file}"/>
+</and>
-<arg value="${helium.dir}/tools/testing/ats/${ats.wsh.testrun.file}" />
+<then>
-</exec>
+<java classname="com.nokia.taitei.util.TestDropImporter" fork="true" maxmemory="1024m" failonerror="true">
+<classpath>
+<pathelement path="${java.class.path}"/>
+</classpath>
+<arg line="${ats.server} ${ats.drop.location.file} ${ats.username} ${ats.password}"/>
+</java>
+</then>
+<else>
+<condition property="ats.wsh.testrun.file" value="wshTestRunImport.vbs" else="wshTestRunX.vbs">
+<equals arg1="${ats.script.type}" arg2="import" />
+</condition>
+<exec executable="cscript" dir="${build.drive}/" failonerror="true">
+<env key="ats3.username" value="${ats.username}" />
+<env key="ats3.password" value="${ats.password}" />
+<env key="ats3.host" value="${ats.server}" />
+<env key="ats3.pathToDrop" value="${ats.drop.location.file}"/>
+<arg value="${helium.dir}/tools/testing/ats/${ats.wsh.testrun.file}" />
+</exec>
+</else>
+</if>
 </else>
 </if>
-</else>
+</try>
-</if>
+<catch>
+<echo message="Error: ${exception}"/>
+</catch>
+</trycatch>
 </target>
 <!-- The target is dependent on "ats-test", should not be called independently. The target fetches flash files location -->
 <target name="ats-set-flash-image-path" unless="ats.emulator.enable">
 <pathconvert pathsep="," property="ats.flash.images">
 <script language="jython" setbeans="false">
 if project.getProperty('ats.disable.iconfig') == None:
 import atsant
 ic = None
 try:
-ic = atsant.IConfigATS(project.getProperty('release.images.dir'))
+ic = atsant.IConfigATS(project.getProperty('release.images.dir'), project.getProperty('ats.product.name'))
 except Exception, ex:
 print ex
 if ic:
 project.setProperty('ats.flash.images', ic.findimages())
 </script>
 <arg value="--specific-pkg=${ats.specific.pkg}" />
 <arg value="--hti=${ats.hti}" />
 <arg value="--verbose" />
 <arg line="${module.tsrc.@{module}}" />
 </exec>
-<runtarget target="do-ats-test" />
+<antcall target="do-ats-test" />
 <math result="drop.file.counter" operand1="1" operation="+" operand2="${drop.file.counter}" datatype="int" />
 </sequential>
 </for>
 </else>
 </if>
 <else>
 <property name="ats.flash.images" value="${build.output.dir}/ats/${build.id}_emulator_urel.zip"/>
 </else>
 </if>
 </target>
+<!-- Generate and upload drop using custom template -->
+<target name="ats-custom-drop">
+<mkdir dir="${build.output.dir}/ats" />
+<runtarget target="ats-set-flash-image-path" />
+<runtarget target="ats-set-defaults-stifeunit" />
+<property name="ats.custom.template" value="${helium.dir}/tools/testing/ats/templates/ats4_naviengine_template.xml"/>
+<exec executable="python">
+<arg line="-Wignore -m ats3.custom" />
+<arg value="--custom-template=${ats.custom.template}" />
+<arg value="--device-type=${ats.product.name}" />
+<arg value="${internal.ats.diamonds.arg}" />
+<arg value="--drop-file=${build.output.dir}/ats/${ats.drop.file}" />
+<arg value="--report-email=${ats.email.list}" />
+<arg value="--testrun-name=${ats.testrun.name}" />
+<arg value="--flash-images=${ats.flash.images}" />
+<arg value="--test-timeout=${ats.test.timeout}" />
+<arg value="--test-type=${ats.custom.test.type}" />
+</exec>
+<runtarget target="do-ats-test" />
+</target>
 </project>

branch	helium-9.0
changeset 618	df88fead2976
parent 587	85df38eb4012