--- a/common/build.postbuild.xml Tue Aug 25 11:06:23 2009 +0100
+++ b/common/build.postbuild.xml Fri Aug 28 10:25:09 2009 +0100
@@ -460,55 +460,7 @@
files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path,localpath]})
</data>
</fmpp>
- </target>
-
- <target name="sf-build-smoketestpkg" depends="sf-getenv-tools">
- <delete dir ="${build.drive}/smoketest"/>
- <delete file ="${build.log.dir}/ATS_${build.id}_smoketest.log"/>
-
- <echo message="INFO Copy smoketest source to EPOCROOT"/>
-
- <copy todir="${build.drive}/smoketest">
- <fileset dir="${sf.common.config.dir}/tools/ats/smoketest"/>
- </copy>
-
- <echo message="INFO Building smoketest"/>
- <exec executable="cmd" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
- <arg value="/c"/>
- <arg value="sbs -b bld.inf -c winscw_udeb.test"/>
- </exec>
-
- <echo message="INFO Creating smoketest testpackage"/>
- <exec executable="perl" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
- <arg value="smoketest.pl"/>
- </exec>
- <copy file="${build.drive}/smoketest/group/smoketest.zip" todir="${sf.spec.test.package.location}"/>
-
- <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="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/>
- <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}"/>
- </exec>
- <!-- Now ready to send to ATS3 -->
- </target>
-
- <target name="sf-send-testpkg" depends="sf-find-ATS-worker-root,sf-make-junction">
- <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">
- <arg value="ats3_testdrop.pl"/>
- <arg value="--host=${sf.spec.test.host.name}"/>
- <arg value="--username=${sf.spec.test.host.username}"/>
- <arg value="--password=${sf.spec.test.host.password}"/>
- <arg value="--local-test-pkg=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>
- <arg value="--local-drop-path=${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>
- <arg value="--host-drop-path=${sf.spec.test.host.droppath}"/>
- </exec>
- </target>
+ </target>
<!-- package all logs into zipfile before publish -->
<target name="sf-zip-logs">
@@ -533,104 +485,7 @@
</move>
</then>
</if>
- </target>
-
- <target name="sf-bc-check">
-
- <if><isset property="env.PDT_HOME"/>
- <then>
- <!-- create BC dir -->
- <mkdir dir="${build.log.dir}/BC"/>
-
- <delete file="${build.log.dir}/BC/bc.config" quiet="true"/>
- <delete file="${build.log.dir}/BC/BBCResults.xsl" quiet="true"/>
- <delete file="${build.log.dir}/BC/libraries.txt" quiet="true"/>
- <delete file="${build.log.dir}/BC/libraries_report.xml" quiet="true"/>
- <delete file="${build.log.dir}/BC/headers.txt" quiet="true"/>
- <delete file="${build.log.dir}/BC/headers_report.xml" quiet="true"/>
-
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="BASELINE_NAME=${sf.spec.bccheck.baseline.name}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="BASELINE_SDK_DIR=${sf.spec.bccheck.baseline.skd.dir}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="BASELINE_SDK_S60_VERSION=${sf.spec.bccheck.baseline.s60.version}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="CURRENT_NAME=${build.id}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="CURRENT_SDK_DIR=${build.drive}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="CURRENT_SDK_S60_VERSION=${sf.spec.bccheck.current.s60.version}"/>
- </exec>
-
- <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/BBCResults.xsl" tofile="${build.log.dir}/BC/BBCResults.xsl" failonerror="false" verbose="true"/>
-
- <if><istrue value="${sf.spec.bccheck.enable.la}"/>
- <then>
- <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/libraries.txt">
- <arg value="CheckBC.py"/>
- <arg value="${build.log.dir}/BC/bc.config"/>
- <arg value="-la"/>
- <arg value="-f"/>
- <arg value="${sf.spec.bccheck.reportid}"/>
- </exec>
- <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Libraries_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/libraries_report.xml" failonerror="false" verbose="true"/>
- </then>
- </if>
-
- <if><istrue value="${sf.spec.bccheck.enable.ha}"/>
- <then>
- <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/headers.txt">
- <arg value="CheckBC.py"/>
- <arg value="${build.log.dir}/BC/bc.config"/>
- <arg value="-ha"/>
- <arg value="-f"/>
- <arg value="${sf.spec.bccheck.reportid}"/>
- </exec>
- <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Headers_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/headers_report.xml" failonerror="false" verbose="true"/>
- </then>
- </if>
-
- <if><istrue value="${sf.spec.bccheck.enable.dynamic}"/>
- <then>
- <echo message="INFO Updating bctest 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}_dynamicbc.log">
- <arg value="ats_specialise_test_drop.pl"/>
- <arg value="--test-drop-name=bctest-${build.id}"/>
- <arg value="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/>
- <arg value="--src=${sf.spec.test.package.location}\..\bctest\bctest.zip"/>
- <arg value="--dest=${sf.spec.test.package.location}\${sf.spec.bccheck.package.name}"/>
- </exec>
- <!-- Now ready to send to ATS3 -->
-
- <antcall target="sf-send-testpkg" inheritAll="false">
- <param name="sf.spec.test.package.name" value="${sf.spec.bccheck.package.name}"/>
- </antcall>
- </then>
- </if>
- </then>
- <else>
- <echo message="WARNING: PDT_HOME not set, I dont know where the BC tools are installed so cannot continue"/>
- </else>
- </if>
- </target>
+ </target>
<target name="sf-publish" depends="prep-publish">
<copy todir="${publish.dir}" preservelastmodified="true" failonerror="false">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/build.test.xml Fri Aug 28 10:25:09 2009 +0100
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="SF-COMMON-BCTEST" xmlns:hlm="http://www.nokia.com/helium">
+
+<!-- static and dynamic BC Test target -->
+ <target name="sf-bc-check">
+ <if><isset property="env.PDT_HOME"/>
+ <then>
+ <!-- create BC dir -->
+ <mkdir dir="${build.log.dir}/BC"/>
+ <delete file="${build.log.dir}/BC/bc.config" quiet="true"/>
+ <delete file="${build.log.dir}/BC/BBCResults.xsl" quiet="true"/>
+ <delete file="${build.log.dir}/BC/libraries.txt" quiet="true"/>
+ <delete file="${build.log.dir}/BC/libraries_report.xml" quiet="true"/>
+ <delete file="${build.log.dir}/BC/headers.txt" quiet="true"/>
+ <delete file="${build.log.dir}/BC/headers_report.xml" quiet="true"/>
+
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="BASELINE_NAME=${sf.spec.bccheck.baseline.name}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="BASELINE_SDK_DIR=${sf.spec.bccheck.baseline.skd.dir}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="BASELINE_SDK_S60_VERSION=${sf.spec.bccheck.baseline.s60.version}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="CURRENT_NAME=${build.id}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="CURRENT_SDK_DIR=${build.drive}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="CURRENT_SDK_S60_VERSION=${sf.spec.bccheck.current.s60.version}"/>
+ </exec>
+
+ <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/BBCResults.xsl" tofile="${build.log.dir}/BC/BBCResults.xsl" failonerror="false" verbose="true"/>
+
+ <if><istrue value="${sf.spec.bccheck.enable.la}"/>
+ <then>
+ <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/libraries.txt">
+ <arg value="CheckBC.py"/>
+ <arg value="${build.log.dir}/BC/bc.config"/>
+ <arg value="-la"/>
+ <arg value="-f"/>
+ <arg value="${sf.spec.bccheck.reportid}"/>
+ </exec>
+ <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Libraries_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/libraries_report.xml" failonerror="false" verbose="true"/>
+ </then>
+ </if>
+
+ <if><istrue value="${sf.spec.bccheck.enable.ha}"/>
+ <then>
+ <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/headers.txt">
+ <arg value="CheckBC.py"/>
+ <arg value="${build.log.dir}/BC/bc.config"/>
+ <arg value="-ha"/>
+ <arg value="-f"/>
+ <arg value="${sf.spec.bccheck.reportid}"/>
+ </exec>
+ <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Headers_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/headers_report.xml" failonerror="false" verbose="true"/>
+ </then>
+ </if>
+
+ <if><istrue value="${sf.spec.bccheck.enable.dynamic}"/>
+ <then>
+ <for param="file">
+ <path>
+ <fileset dir="${sf.spec.test.package.location}/../bctest" includes="*.zip"/>
+ </path>
+ <sequential>
+ <propertyregex override="yes" property="program" input="@{file}" regexp="([^\\/\/]*)$" select="\1"/>
+ <echo message="INFO Updating bctest package with test info"/>
+ <echo message="************ Test drop package name: ${program} " />
+ <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_dynamicbc.log">
+ <arg value="ats_specialise_test_drop.pl"/>
+ <arg value="--test-drop-name=${env.COMPUTERNAME}-bctest-${build.id}_${program}"/>
+ <arg value="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/>
+ <arg value="--src=${sf.spec.test.package.location}/../bctest/${program}"/>
+ <arg value="--dest=${sf.spec.test.package.location}\${env.COMPUTERNAME}-bctest-${build.id}_${program}" />
+ </exec>
+ <!-- Now ready to send to ATS3 -->
+ <echo message="Sending Test drop : ${program} ............" />
+ <antcall target="sf-send-testpkg" inheritAll="false">
+ <param name="sf.spec.test.package.name" value="${env.COMPUTERNAME}-bctest-${build.id}_${program}"/>
+ </antcall>
+
+ </sequential>
+
+ </for>
+ </then>
+ </if>
+ </then>
+ <else>
+ <echo message="WARNING: PDT_HOME not set, I dont know where the BC tools are installed so cannot continue"/>
+ </else>
+ </if>
+ </target>
+
+ <!-- Preparing smoketest package (zip) for sending to ATS3 -->
+
+ <target name="sf-build-smoketestpkg" depends="sf-getenv-tools">
+ <delete dir ="${build.drive}/smoketest"/>
+ <delete file ="${build.log.dir}/ATS_${build.id}_smoketest.log"/>
+
+ <echo message="INFO Copy smoketest source to EPOCROOT"/>
+
+ <copy todir="${build.drive}/smoketest">
+ <fileset dir="${sf.common.config.dir}/tools/ats/smoketest"/>
+ </copy>
+
+ <echo message="INFO Building smoketest"/>
+ <exec executable="cmd" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+ <arg value="/c"/>
+ <arg value="sbs -b bld.inf -c winscw_udeb.test"/>
+ </exec>
+
+ <echo message="INFO Creating smoketest testpackage"/>
+ <exec executable="perl" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+ <arg value="smoketest.pl"/>
+ </exec>
+ <copy file="${build.drive}/smoketest/group/smoketest.zip" todir="${sf.spec.test.package.location}"/>
+
+ <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="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/>
+ <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}"/>
+ </exec>
+ <!-- Now ready to send to ATS3 -->
+ </target>
+
+ <!-- Sending testdrop to ATS3 -->
+
+ <target name="sf-send-testpkg" depends="sf-make-junction">
+ <mkdir dir="${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">
+ <arg value="ats3_testdrop.pl"/>
+ <arg value="--host=${sf.spec.test.host.name}"/>
+ <arg value="--username=${sf.spec.test.host.username}"/>
+ <arg value="--password=${sf.spec.test.host.password}"/>
+ <arg value="--local-test-pkg=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>
+ <arg value="--local-drop-path=${sf.spec.test.package.droppath}"/>
+ <arg value="--host-drop-path=${sf.spec.test.host.droppath}"/>
+ </exec>
+ </target>
+</project>
--- a/common/build.xml Tue Aug 25 11:06:23 2009 +0100
+++ b/common/build.xml Fri Aug 28 10:25:09 2009 +0100
@@ -45,6 +45,9 @@
<!-- Import functionality distributed into other file(s) -->
<import file="${sf.common.config.dir}/build.postbuild.xml"/>
+
+ <!-- Import test functionality distributed into other file(s) -->
+ <import file="${sf.common.config.dir}/build.test.xml"/>
<!-- setup conditional Helium internal properties -->
<if><istrue value="${sf.spec.sourcesync.usecache}"/>