# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1250256859 -3600
# Node ID 32e90c026ea4efe7d456bafbd97b14f63ca34508
# Parent  1fa0548ccf3848fad54e01c918d64af0c26f86a5# Parent  bf2e2e1cb5ada41c4f43b78cdd1de395e656f833
catchup merge

diff -r 1fa0548ccf38 -r 32e90c026ea4 common/build.xml
--- a/common/build.xml	Fri Aug 14 12:08:05 2009 +0100
+++ b/common/build.xml	Fri Aug 14 14:34:19 2009 +0100
@@ -387,6 +387,9 @@
                 <runtarget target="sf-package-validate"/>
             </then>
         </if>
+        <!-- run build analysis tools -->
+        <runtarget target="sf-run-analysis"/>
+        
         </parallel>
         
         <if><istrue value="${sf.spec.test.sendpkg.enable}"/>
@@ -396,8 +399,6 @@
             </then>
         </if>
 
-        <!-- run build analysis tools -->
-        <runtarget target="sf-run-analysis"/>
 
         <runtarget target="sf-zip-logs"/>
 
@@ -462,14 +463,16 @@
     <target name="sf-list-dir">
         <property name="sf.currentlist.name"   value="${sf.list.name}"/> 
         <property name="sf.dir.location" value="${build.drive}/epoc32"/> 
+        <property name="sf.dir.exclude" value="${build.drive}/epoc32/build"/> 
     
         <if>
             <istrue value="${sf.spec.dirlist.enable}"/>
             <then>
-                <echo message="Dirlist name: ${sf.currentlist.name} requested for ${sf.dir.location}"/>
-                <exec executable="perl" dir="${build.log.dir}/" failonerror="true" output="${build.log.dir}/listdir_${build.id}_${sf.currentlist.name}.log">
-                    <arg value="${sf.common.config.dir}/tools/listdir.pl"/>
+                <echo message="Dirlist name: ${sf.currentlist.name} requested for ${sf.dir.location} excluding ${sf.dir.exclude}"/>
+                <exec executable="python" dir="${build.log.dir}/" failonerror="true" output="${build.log.dir}/listdir_${build.id}_${sf.currentlist.name}.log">
+                    <arg value="${sf.common.config.dir}/tools/listdir.py"/>
                     <arg value="${sf.dir.location}"/>
+                    <arg value="${sf.dir.exclude}"/>
                 </exec>
             </then>
         </if>
@@ -712,27 +715,37 @@
         <arg value="${build.drive}/output/zips/bin*.zip"/>
         </exec>
     </target>
+
+    <target name="sf-find-ATS-worker-root">
+      <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/devices" failonerror="false" outputproperty="sf.spec.test.workerroot">
+        <arg value="-pe"/>
+        <arg value="&quot;m/TEMPDIR=(\S+)/;print $1;s/.*\n//g&quot;"/>
+        <arg value="${env.COMPUTERNAME}\EMULATOR_GENERIC_${env.COMPUTERNAME}.properties" /> 
+      </exec>
+      <echo message="ATS Worker Root = ${sf.spec.test.workerroot}"/> 
+    </target>
     
-    <target name ="sf-make-junction">
-        <mkdir dir="${sf.spec.test.epocroot}"/>
+    <target name ="sf-make-junction" depends="sf-find-ATS-worker-root">
+        
+        <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.epocroot}"/>
 
         <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_make_junction.log">
         <arg value="make_junction.pl"/>
-        <arg value="--link=${sf.spec.test.epocroot}/epoc32"/>
+        <arg value="--link=${sf.spec.test.workerroot}/${sf.spec.test.epocroot}/epoc32"/>
         <arg value="--target=${build.drive}/epoc32"/>
         <arg value="--force"/>
       </exec>
     </target>
 
-    <target name ="sf-delete-junction">
-        <exec executable="junction.exe" dir="${sf.spec.test.epocroot}" failonerror="false" output="${build.log.dir}/ATS_${build.id}_delete_junction.log">
+    <target name ="sf-delete-junction" depends="sf-find-ATS-worker-root">
+        <exec executable="junction.exe" dir="${sf.spec.test.workerroot}/${sf.spec.test.epocroot}" failonerror="false" output="${build.log.dir}/ATS_${build.id}_delete_junction.log">
         <arg value="-d"/>
         <arg value="epoc32"/>
       </exec>
     </target>  
-    
-    <target name="sf-send-testpkg" depends="sf-make-junction">
-        <mkdir dir="${sf.spec.test.package.droppath}"/>
+        
+    <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"/>
@@ -740,7 +753,7 @@
             <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="--local-drop-path=${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>
             <arg value="--host-drop-path=${sf.spec.test.host.droppath}"/>
         </exec>
     </target>
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Fri Aug 14 12:08:05 2009 +0100
+++ b/common/common_props.ant.xml	Fri Aug 14 14:34:19 2009 +0100
@@ -83,12 +83,12 @@
     <property name="sf.spec.test.host.username"  value="admin"/>
     <property name="sf.spec.test.host.password"  value="admin"/>
     <property name="sf.spec.test.host.droppath"  value="D:\ats3_testdrop_arrivals\${env.COMPUTERNAME}"/>
-    <property name="sf.spec.test.epocroot"       value="D:\ATS3\winscw_smoketest"/>
+    <property name="sf.spec.test.epocroot"       value="winscw_smoketest"/>
 
     <!-- ATS properties -->
     <property name="sf.spec.test.package.location"  value="\\${sf.spec.test.host.name}\ats3_testdrop_arrivals\${env.COMPUTERNAME}"/>
     <property name="sf.spec.test.package.name"      value="${env.COMPUTERNAME}-Smoketest-${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}.zip"/> <!-- build.id not available at this point, so construct it from component parts -->
-    <property name="sf.spec.test.package.droppath"  value="D:\ATS3\TestDrops"/>
+    <property name="sf.spec.test.package.droppath"  value="TestDrops"/>
 
     <!-- BC check properties -->
     <property name="sf.spec.bccheck.enable" value="false"/>
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/ats/devices/c100726/EMULATOR_GENERIC_c100726.properties
--- a/common/tools/ats/devices/c100726/EMULATOR_GENERIC_c100726.properties	Fri Aug 14 12:08:05 2009 +0100
+++ b/common/tools/ats/devices/c100726/EMULATOR_GENERIC_c100726.properties	Fri Aug 14 14:34:19 2009 +0100
@@ -7,7 +7,7 @@
 
 CONNECTION=emulator
 
-TEMPDIR=D:\\ats3
+TEMPDIR=C:\\apps\\ATS3\\tmp\\emulator
 
 CLASS=GenericTestableDevice
 
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/ats/devices/lon-engbuild87/EMULATOR_GENERIC_LON-ENGBUILD87.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/lon-engbuild87/EMULATOR_GENERIC_LON-ENGBUILD87.properties	Fri Aug 14 14:34:19 2009 +0100
@@ -0,0 +1,24 @@
+
+NAME=GENERIC EMULATOR on LON-ENGBUILD87
+
+CATEGORY=hardware
+
+TYPE=WINSCW
+
+CONNECTION=emulator
+
+TEMPDIR=D:\\ats3
+
+CLASS=GenericTestableDevice
+
+HARNESS=GENERIC
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=WINSCW
+BUILD=udeb
+
+IMAGE=winscw_smoketest
+
+
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/ats/devices/lon-engbuild87/EMULATOR_GENERIC_LONENGBUILD87.properties
--- a/common/tools/ats/devices/lon-engbuild87/EMULATOR_GENERIC_LONENGBUILD87.properties	Fri Aug 14 12:08:05 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-
-NAME=GENERIC EMULATOR on LON-ENGBUILD87
-
-CATEGORY=hardware
-
-TYPE=WINSCW
-
-CONNECTION=emulator
-
-TEMPDIR=D:\\ats3
-
-CLASS=GenericTestableDevice
-
-HARNESS=GENERIC
-
-#reinstall files after reboot
-REINSTALL=false
-
-PLATFORM=WINSCW
-BUILD=udeb
-
-IMAGE=winscw_smoketest
-
-
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/ats/devices/lon-engbuild89/EMULATOR_GENERIC_LON-ENGBUILD89.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/lon-engbuild89/EMULATOR_GENERIC_LON-ENGBUILD89.properties	Fri Aug 14 14:34:19 2009 +0100
@@ -0,0 +1,22 @@
+
+NAME=GENERIC EMULATOR on LON-ENGBUILD89
+
+CATEGORY=hardware
+
+TYPE=WINSCW
+
+CONNECTION=emulator
+
+TEMPDIR=D:\\ATS3
+
+CLASS=GenericTestableDevice
+
+HARNESS=GENERIC
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=WINSCW
+BUILD=udeb
+
+IMAGE=winscw_smoketest
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/ats/devices/lon-engbuild89/EMULATOR_GENERIC_LONENGBUILD89.properties
--- a/common/tools/ats/devices/lon-engbuild89/EMULATOR_GENERIC_LONENGBUILD89.properties	Fri Aug 14 12:08:05 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-
-NAME=GENERIC EMULATOR on LON-ENGBUILD89
-
-CATEGORY=hardware
-
-TYPE=WINSCW
-
-CONNECTION=emulator
-
-TEMPDIR=D:\\ATS3
-
-CLASS=GenericTestableDevice
-
-HARNESS=GENERIC
-
-#reinstall files after reboot
-REINSTALL=false
-
-PLATFORM=WINSCW
-BUILD=udeb
-
-IMAGE=winscw_smoketest
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYM-BUILD02.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYM-BUILD02.properties	Fri Aug 14 14:34:19 2009 +0100
@@ -0,0 +1,22 @@
+
+NAME=GENERIC EMULATOR on SYM-BUILD02
+
+CATEGORY=hardware
+
+TYPE=WINSCW
+
+CONNECTION=emulator
+
+TEMPDIR=C:\\ATS3
+
+CLASS=GenericTestableDevice
+
+HARNESS=GENERIC
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=WINSCW
+BUILD=udeb
+
+IMAGE=winscw_smoketest
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties
--- a/common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties	Fri Aug 14 12:08:05 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-
-NAME=GENERIC EMULATOR on SYM-BUILD02
-
-CATEGORY=hardware
-
-TYPE=WINSCW
-
-CONNECTION=emulator
-
-TEMPDIR=C:\\ATS3
-
-CLASS=GenericTestableDevice
-
-HARNESS=GENERIC
-
-#reinstall files after reboot
-REINSTALL=false
-
-PLATFORM=WINSCW
-BUILD=udeb
-
-IMAGE=winscw_smoketest
diff -r 1fa0548ccf38 -r 32e90c026ea4 common/tools/listdir.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/listdir.py	Fri Aug 14 14:34:19 2009 +0100
@@ -0,0 +1,43 @@
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# mattd <mattd@symbian.org>
+#
+# Description:
+# listdir.py - Lists a directory contents.
+# listdir.py <directory> (<exclude_directory>)
+
+import os
+import re
+import sys
+import string
+from os.path import join, isfile
+
+def main():
+  directory = sys.argv[1]
+  exclude_dirs = []
+  if(len(sys.argv)>2):
+    x_dirs = string.lower(sys.argv[2])
+    exclude_dirs = re.split(',', x_dirs)
+  scandir(directory, exclude_dirs)
+
+def scandir(top, exclude_dirs):
+    fixpath = re.compile('\\\\')    
+    fixroot = re.compile('^%s\\\\' % top)
+    for root, dirs, files in os.walk(top, topdown=True):
+        for dirname in dirs:
+            if(string.lower(fixpath.sub('/',os.path.join(root,dirname))) in exclude_dirs):
+              dirs.remove(dirname)
+        for name in files:
+            filename = os.path.join(root, name)
+            fn = string.lower(fixpath.sub('/',fixroot.sub('',filename)))
+            print fn
+
+main()