incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1371764 [2/2] - /incubator/flex/trunk/mustella/build.xml
Date Fri, 10 Aug 2012 16:33:37 GMT

Modified: incubator/flex/trunk/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/mustella/build.xml?rev=1371764&r1=1371763&r2=1371764&view=diff
==============================================================================
--- incubator/flex/trunk/mustella/build.xml (original)
+++ incubator/flex/trunk/mustella/build.xml Fri Aug 10 16:33:37 2012
@@ -36,7 +36,7 @@
     
     <!-- AJH shut off excludes for now -->
     <property name="excludes_done" value="true" />
-	
+    
     <property name="HOMEPATH" value="${env.HOMEDRIVE}${env.HOMEPATH}" />
 
     <pathconvert property="mustella.dir" dirsep="/" >
@@ -59,11 +59,8 @@
     <property name="apollo_transform_prefix2" value="wwaird_" />
 
     <property name="apollo_transform_template" value="${mustella.dir}/Assets/AirTransform/WindowedAppTemplate.mxml" />
-
-
     <property name="previous.generated.testfiles" value="**/*.swf,**/*.output,**/SWFs/${apollo_transform_prefix}*.mxml,**/swfs/${apollo_transform_prefix}*.mxml,**/SWFs/${apollo_transform_prefix2}*.mxml,**/swfs/${apollo_transform_prefix2}*.mxml" />
-
-
+    
     <property name="sdk.mustella.dir" value="${mustella.dir}/tests" />
 
     <property name="root.dir" value="${basedir}/.."/>
@@ -98,8 +95,6 @@
     <property name="insert_results" value="" />
     <property name="run_this_script" value="" />
 
-
-
     <!-- the old approach, compile in the excludes, not generally used -->
     <property name="exclude_source_path" value="" />
     <property name="default.excludes.asfile" value="CurrentExcludeList.as" />
@@ -107,7 +102,6 @@
     <property name="default.excludes.swcclass" value="CurrentExcludeList" />
     <property name="default.excludes.swc" value="CurrentExcludeList.swc" />
 
-
     <property name="excludelibrarypath" value="" />
 
     <property name="fork_compile" value="true" />
@@ -122,13 +116,12 @@
 
     <property name="player.timeout" value="45" />
 
-
-	<!-- SDK jar files -->
-	<path id="sdk.lib.classpath">
-		<fileset dir="${sdk.dir}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
+    <!-- SDK jar files -->
+    <path id="sdk.lib.classpath">
+        <fileset dir="${sdk.dir}/lib">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
 
     <path id="flex.test.classpath">
         <pathelement location="${classes.dir}"/>
@@ -139,83 +132,82 @@
 
     <property name="require_this_directory_too" value="" />
 
-	<!-- host_os_name (formerly real_os_name) is the machine which is compiling. -->
+    <!-- host_os_name (formerly real_os_name) is the machine which is compiling. -->
     <condition property="host_os_name" value="mac" >
-		<os family="mac" />
+        <os family="mac" />
     </condition>
 
     <condition property="short_os_name" value="mac" >
-		<os family="mac" />
+        <os family="mac" />
     </condition>
 
     <condition property="host_os_name" value="windows" >
-		<os family="windows" />
+        <os family="windows" />
     </condition>
 
     <condition property="short_os_name" value="win" >
-		<os family="windows" />
+        <os family="windows" />
     </condition>
 
     <condition property="host_os_name" value="Linux" >
-		<os name="Linux" />
-    </condition>	
+        <os name="Linux" />
+    </condition>    
 
-	<!-- Mobile stuff will be changed by handle_mobile_config later if it's a mobile run. -->
-	<property name="target_os_name" value="${host_os_name}" />
+    <!-- Mobile stuff will be changed by handle_mobile_config later if it's a mobile run. -->
+    <property name="target_os_name" value="${host_os_name}" />
 
     <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListWin.txt" >
-		<equals arg1="${target_os_name}" arg2="windows" />
+        <equals arg1="${target_os_name}" arg2="windows" />
     </condition>
 
     <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListMac.txt" >
-		<equals arg1="${target_os_name}" arg2="mac" />
+        <equals arg1="${target_os_name}" arg2="mac" />
     </condition>
 
     <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListLinux.txt" >
-		<equals arg1="${target_os_name}" arg2="Linux" />
+        <equals arg1="${target_os_name}" arg2="Linux" />
     </condition>
 
-	<echo>exclude file will be: ${exclude_filename}</echo>
-	
-	<!-- Whether a run will spawn its own baseline server.  With multiple runs on a machine, they will collide. -->
-	<property name="prevent_baseline_server" value="${prevent_baseline_server}" />
-	
-	<!-- This does things like setting up mxmlc.  -->
+    <echo>exclude file will be: ${exclude_filename}</echo>
+    
+    <!-- Whether a run will spawn its own baseline server.  With multiple runs on a machine, they will collide. -->
+    <property name="prevent_baseline_server" value="${prevent_baseline_server}" />
+    
+    <!-- This does things like setting up mxmlc.  -->
     <target name="get_os" >
-		<condition property="is_mac" value="true" >
-			<equals arg1="${host_os_name}" arg2="mac" />
-		</condition>
-		<condition property="is_win" value="true" >
-			<or>
-				<equals arg1="${host_os_name}" arg2="windows" />
-				<equals arg1="${host_os_name}" arg2="win" />
-			</or>
-		</condition>
-		<condition property="is_linux" value="true" >
-			<equals arg1="${host_os_name}" arg2="Linux" />
-		</condition>
+        <condition property="is_mac" value="true" >
+            <equals arg1="${host_os_name}" arg2="mac" />
+        </condition>
+        <condition property="is_win" value="true" >
+            <or>
+                <equals arg1="${host_os_name}" arg2="windows" />
+                <equals arg1="${host_os_name}" arg2="win" />
+            </or>
+        </condition>
+        <condition property="is_linux" value="true" >
+            <equals arg1="${host_os_name}" arg2="Linux" />
+        </condition>
     </target>
 
     <!-- unzip, needed for installation, varies on windows -->
     <condition property="unzip" value="/cygwin/bin/unzip.exe" >
-	<os family="windows" />
+    <os family="windows" />
     </condition>
 
     <!-- ... but seems the same on mac & Linux -->
     <property name="unzip" value="/usr/bin/unzip" />
 
-
     <condition property="branch_name" value="Mainline" >
-	<not>
-		<isset property="branch_name" />
-	</not>
+    <not>
+        <isset property="branch_name" />
+    </not>
     </condition>
 
     <!-- browser_name represents the runtime. -->
     <condition property="browser_name" value="Standalone" >
-	<not>
-		<istrue value="${use_browser}" />
-	</not>
+    <not>
+        <istrue value="${use_browser}" />
+    </not>
     </condition>
 
     <!-- the local.properties file has to be there for the subsequent
@@ -223,84 +215,81 @@
 
     <!-- filtering/standarizing of browser_name here   -->
     <loadfile failonerror="false" srcfile="${mustella.dir}/${local_properties}" property="browser_name" >
-	<filterchain>
-	<linecontainsregexp>
-		<regexp pattern="^browser=.*$"/>
-	</linecontainsregexp>
-	<tokenfilter>
-		<replaceregex pattern=".*/" replace=""  flags="g"/>
-		<replaceregex pattern=".exe" replace=""  flags="g"/>
-		<replaceregex pattern='\"' replace=""  flags="g"/>
-	</tokenfilter>
-	</filterchain>
-    </loadfile>
+        <filterchain>
+            <linecontainsregexp>
+                <regexp pattern="^browser=.*$"/>
+            </linecontainsregexp>
+            <tokenfilter>
+                <replaceregex pattern=".*/" replace=""  flags="g"/>
+                <replaceregex pattern=".exe" replace=""  flags="g"/>
+                <replaceregex pattern='\"' replace=""  flags="g"/>
+            </tokenfilter>
+        </filterchain>
+        </loadfile>
 
     <!-- could be trouble later. We don't default well. -->
     <condition property="browser_name_not_set" value="true" >
-	<and>
-	<not>
-		<isset property="browser_name"/>
-	</not>
-	    <istrue value="${use_browser}" />
-	</and>
+        <and>
+        <not>
+            <isset property="browser_name"/>
+        </not>
+            <istrue value="${use_browser}" />
+        </and>
     </condition>
 
     <condition property="browser_name" value="iexplore" >
-	<and>
-	<istrue value="${browser_name_not_set}" />
-	<contains string="${browser}" substring="iexplore" casesensitive="false" />
-	</and>
+        <and>
+            <istrue value="${browser_name_not_set}" />
+            <contains string="${browser}" substring="iexplore" casesensitive="false" />
+        </and>
     </condition>
 
     <condition property="excludes_done" value="true" >
-    <istrue value="${skip_exclude}" />
+        <istrue value="${skip_exclude}" />
     </condition>
 
     <condition property="config_id" value="1" >
-	<and>
-    	<istrue value="${excludes_done}" />
-    	<equals arg1="-1" arg2="${current.run.id}" />
-	</and>
+        <and>
+            <istrue value="${excludes_done}" />
+            <equals arg1="-1" arg2="${current.run.id}" />
+        </and>
     </condition>
 
     <condition property="exclude_ids" value="(1)" >
-	<and>
-    	<istrue value="${excludes_done}" />
-    	<equals arg1="-1" arg2="${current.run.id}" />
-	</and>
+        <and>
+            <istrue value="${excludes_done}" />
+            <equals arg1="-1" arg2="${current.run.id}" />
+        </and>
     </condition>
 
-
-
-
     <!-- don't try fetching a config ID if we've decided we don't care about excludes -->
     <condition property="config_id" value="1" >
-    <istrue value="${skip_exclude}" />
+        <istrue value="${skip_exclude}" />
     </condition>
 
     <!-- run type values. (stored in db) -->
     <condition property="run_type" value="swfloader" >
-	<isset property="shell_swf" />
+    <isset property="shell_swf" />
     </condition>
 
     <condition property="run_type" value="" >
-	<not>
-	<isset property="run_type" />
-	</not>
+        <not>
+            <isset property="run_type" />
+        </not>
     </condition>
 
     <condition property="vetting" value="" >
-	<or>
-        <equals arg1="${run_type}" arg2=""/>
-	<not>
-	<isset property="run_type" />
-	</not>
-	</or>
+        <or>
+            <equals arg1="${run_type}" arg2=""/>
+            <not>
+                <isset property="run_type" />
+            </not>
+        </or>
     </condition>
 
     <condition property="do_mustellaswc_compile" value="true" >
         <not>
-			<available file="${mustella.dir}/${mustella.swc.name}" />
+            <available file="${mustella.dir}/${mustella.swc.name}" />
         </not>
     </condition>
 
@@ -323,21 +312,19 @@
     </condition>
 
     <condition property="shell_swf_prefix" value="file:///" >
-	<not>
-	<isset property="${shell_swf_prefix}" />
-	</not>
+        <not>
+            <isset property="${shell_swf_prefix}" />
+        </not>
     </condition>
 
-
-
     <condition property="version_fetcher" value="${mustella.dir}/versionAIR.swf" >
-    	<istrue value="${use_apollo}" />
+        <istrue value="${use_apollo}" />
     </condition>
 
     <property name="version_fetcher" value="${mustella.dir}/version.swf" />
 
     <condition property="exclude_mixin" value="ExcludeFileLocationApollo" >
-    	<istrue value="${use_apollo}" />
+        <istrue value="${use_apollo}" />
     </condition>
 
     <property name="exclude_mixin" value="ExcludeFileLocation" />
@@ -346,25 +333,25 @@
     <property name="apollo_location" value="${env.AIR_HOME}"/>
 
     <condition property="apollo_specific_excludes" value="${apollo_only_excludes}" >
-    	<istrue value="${use_apollo}" />
+        <istrue value="${use_apollo}" />
     </condition>
 
-	<target name="getExcludeIds" unless="exclude_ids" description="Fetch exclude ids" >
-		<taskdef name="excluder" classname="mustella.GetExcludeIdsTask" classpathref="flex.test.classpath"/>
-		<excluder property="exclude_ids" type="${exclude_type}" filename="${exclude_filename}" branch="${branch_name}" os="${target_os_name}" browser="${browser_name}" apollo="${use_apollo}" bbrowser="${use_browser}" untilTime="${db_time}" write="false" excludeIds=""/>
-	</target>
+    <target name="getExcludeIds" unless="exclude_ids" description="Fetch exclude ids" >
+        <taskdef name="excluder" classname="mustella.GetExcludeIdsTask" classpathref="flex.test.classpath"/>
+        <excluder property="exclude_ids" type="${exclude_type}" filename="${exclude_filename}" branch="${branch_name}" os="${target_os_name}" browser="${browser_name}" apollo="${use_apollo}" bbrowser="${use_browser}" untilTime="${db_time}" write="false" excludeIds=""/>
+    </target>
 
     <property name="bug_retry" value="" />
     <target name="getExcludes" unless="excludes_done" description="Fetch exclude values from db" >
-		<echo>Write excludes file</echo>
-		<mkdir dir="${tmp.dir}/flex" />
-		<mkdir dir="${mustella.dir}/classes" />
-		<delete file="${mustella.dir}/classes/${default.excludes.swc}" />
-		<taskdef name="excluder" classname="mustella.GetExcludeIdsTask" classpathref="flex.test.classpath"/>
-		<excluder property="exclude_ids" type="${exclude_type}" filename="${exclude_filename}" branch="${branch_name}" os="${target_os_name}" browser="${browser_name}" apollo="${use_apollo}" bbrowser="${use_browser}" untilTime="${db_time}" write="true" excludeIds="" bugByPass="${bug_retry}"/>
-		<chmod perm="777" file="${exclude_filename}" />
+        <echo>Write excludes file</echo>
+        <mkdir dir="${tmp.dir}/flex" />
+        <mkdir dir="${mustella.dir}/classes" />
+        <delete file="${mustella.dir}/classes/${default.excludes.swc}" />
+        <taskdef name="excluder" classname="mustella.GetExcludeIdsTask" classpathref="flex.test.classpath"/>
+        <excluder property="exclude_ids" type="${exclude_type}" filename="${exclude_filename}" branch="${branch_name}" os="${target_os_name}" browser="${browser_name}" apollo="${use_apollo}" bbrowser="${use_browser}" untilTime="${db_time}" write="true" excludeIds="" bugByPass="${bug_retry}"/>
+        <chmod perm="777" file="${exclude_filename}" />
 
-		<property name="excludes_done" value="true" />
+        <property name="excludes_done" value="true" />
     </target>
 
     <property name="player.version" value="11.1"/>
@@ -372,91 +359,91 @@
     <!-- shorthand, and something javascript will tolerate: -->
     <property name="pversion" value="${player.version}"/>
 
-	<target name="setup_linux" if="is_linux">
-		<echo>doing linux setup</echo>
-		<property name="mxmlc.exe" value="mxmlc"/>
-		<property name="compc.exe" value="compc" />
-		<property name="player.dir" value="${sdk.dir}/in/player/${player.version}/lnx" />
-		<property name="player" value="${player.dir}/flashplayer" />
-		<property name="apollo_exe" value="adl" />
-		<!-- kind of a guess: -->
-		<property name="shell" value="/bin/bash" />
-		<property name="auto_exclude_config_value" value="10"/>
-		<property name="auto_exclude_bug_id" value="unproven_linux_${fetched_date}" />
-	</target>
-
-	<target name="setup_mac" if="is_mac">
-		<echo>doing mac setup</echo>
-		<property name="mxmlc.exe" value="mxmlc"/>
-		<property name="compc.exe" value="compc" />
-		<property name="shell" value="/bin/sh" />
-
-		<property name="player" value="${env.FLASHPLAYER_DEBUGGER}" />
-		<!-- these values are sort of magic numbers, corresponding to db entries -->
-		<property name="auto_exclude_config_value" value="9"/>
-		<property name="auto_exclude_bug_id" value="unproven_mac_${fetched_date}"/>
-		<echo>excl config val ${auto_exclude_config_value}</echo>
-		<property name="apollo_exe" value="adl" />
-		<property name="shell" value="/bin/sh" />
-		<property name="unzip" value="/usr/bin/unzip" />
-		<property name="auto_exclude_config_value" value="9"/>
-		<property name="auto_exclude_bug_id" value="unproven_mac_${fetched_date}"/>
-	</target>
-
-	<target name="setup_windows" if="is_win">
-		<echo>doing windows setup</echo>
-	    <echo>homepath: ${HOMEPATH} </echo>
-		<property name="mxmlc.exe" value="mxmlc.bat"/>
-		<property name="compc.exe" value="compc.bat" />
-		<property name="shell" value="${cygwinshell}" />
-		<property file="${HOMEPATH}/mm.cfg"/>
-		<echo>trace output file: ${TraceOutputFileEnable} </echo>
-
-		<property name="player" value="${env.FLASHPLAYER_DEBUGGER}" />
-		<property name="apollo_exe" value="adl.exe" />
-
-		<echo>apollo_exe: ${apollo_exe}</echo>
-
-		<!-- these magic numbers correspond to db entries. Relevant for vetting -->
-		<condition property="auto_exclude_config_value" value="1">
-			<and>
-				<isfalse value="${use_apollo}"/>
-				<isfalse value="${use_browser}"/>
-			</and>
-		</condition>
-		<condition property="auto_exclude_config_value" value="2">
-			<istrue value="${use_apollo}"/>
-		</condition>
-		<condition property="auto_exclude_config_value" value="5">
-			<istrue value="${use_browser}"/>
-		</condition>
-		<condition property="auto_exclude_bug_id" value="unproven_${fetched_date}">
-			<and>
-				<isfalse value="${use_apollo}"/>
-				<isfalse value="${use_browser}"/>
-			</and>
-		</condition>
-		<condition property="auto_exclude_bug_id" value="unproven_air_${fetched_date}">
-			<istrue value="${use_apollo}"/>
-		</condition>
-		<condition property="auto_exclude_bug_id" value="unproven_browser_${fetched_date}">
-			<istrue value="${use_browser}"/>
-		</condition>
-		<echo> player is ${player} </echo>
-	</target>
+    <target name="setup_linux" if="is_linux">
+        <echo>doing linux setup</echo>
+        <property name="mxmlc.exe" value="mxmlc"/>
+        <property name="compc.exe" value="compc" />
+        <property name="player.dir" value="${sdk.dir}/in/player/${player.version}/lnx" />
+        <property name="player" value="${player.dir}/flashplayer" />
+        <property name="apollo_exe" value="adl" />
+        <!-- kind of a guess: -->
+        <property name="shell" value="/bin/bash" />
+        <property name="auto_exclude_config_value" value="10"/>
+        <property name="auto_exclude_bug_id" value="unproven_linux_${fetched_date}" />
+    </target>
+
+    <target name="setup_mac" if="is_mac">
+        <echo>doing mac setup</echo>
+        <property name="mxmlc.exe" value="mxmlc"/>
+        <property name="compc.exe" value="compc" />
+        <property name="shell" value="/bin/sh" />
+
+        <property name="player" value="${env.FLASHPLAYER_DEBUGGER}" />
+        <!-- these values are sort of magic numbers, corresponding to db entries -->
+        <property name="auto_exclude_config_value" value="9"/>
+        <property name="auto_exclude_bug_id" value="unproven_mac_${fetched_date}"/>
+        <echo>excl config val ${auto_exclude_config_value}</echo>
+        <property name="apollo_exe" value="adl" />
+        <property name="shell" value="/bin/sh" />
+        <property name="unzip" value="/usr/bin/unzip" />
+        <property name="auto_exclude_config_value" value="9"/>
+        <property name="auto_exclude_bug_id" value="unproven_mac_${fetched_date}"/>
+    </target>
+
+    <target name="setup_windows" if="is_win">
+        <echo>doing windows setup</echo>
+        <echo>homepath: ${HOMEPATH} </echo>
+        <property name="mxmlc.exe" value="mxmlc.bat"/>
+        <property name="compc.exe" value="compc.bat" />
+        <property name="shell" value="${cygwinshell}" />
+        <property file="${HOMEPATH}/mm.cfg"/>
+        <echo>trace output file: ${TraceOutputFileEnable} </echo>
+
+        <property name="player" value="${env.FLASHPLAYER_DEBUGGER}" />
+        <property name="apollo_exe" value="adl.exe" />
+
+        <echo>apollo_exe: ${apollo_exe}</echo>
+
+        <!-- these magic numbers correspond to db entries. Relevant for vetting -->
+        <condition property="auto_exclude_config_value" value="1">
+            <and>
+                <isfalse value="${use_apollo}"/>
+                <isfalse value="${use_browser}"/>
+            </and>
+        </condition>
+        <condition property="auto_exclude_config_value" value="2">
+            <istrue value="${use_apollo}"/>
+        </condition>
+        <condition property="auto_exclude_config_value" value="5">
+            <istrue value="${use_browser}"/>
+        </condition>
+        <condition property="auto_exclude_bug_id" value="unproven_${fetched_date}">
+            <and>
+                <isfalse value="${use_apollo}"/>
+                <isfalse value="${use_browser}"/>
+            </and>
+        </condition>
+        <condition property="auto_exclude_bug_id" value="unproven_air_${fetched_date}">
+            <istrue value="${use_apollo}"/>
+        </condition>
+        <condition property="auto_exclude_bug_id" value="unproven_browser_${fetched_date}">
+            <istrue value="${use_browser}"/>
+        </condition>
+        <echo> player is ${player} </echo>
+    </target>
 
     <!-- get the database time, used for time syncing in exclude db queries
-	     The mustella_auto.sh should have called and set this value; a local
+         The mustella_auto.sh should have called and set this value; a local
              mini_run would need this, so setup depends on db_time  -->
 
     <!-- AJH
     <condition property="db_time" value="${env.db_time}">
-	    <isset property="env.db_time" />
+        <isset property="env.db_time" />
     </condition> -->
 
     <target name="echo-browser" if="use_browser">
         <echo>use_browser=${use_browser}</echo>
-		<echo>browser is ${browser}</echo>
+        <echo>browser is ${browser}</echo>
     </target>
 
     <target name="echo-apollo" if="use_apollo">
@@ -464,104 +451,101 @@
         <echo>apollo_location is ${apollo_location}</echo>        
     </target>
 
-	<target name="setup" depends="get_date,get_os,setup_mac,setup_windows,setup_linux,db_time,handle_mobile_config,echo-browser,echo-apollo"  description="--> set platform specific properties">
-		<!-- antcall target="db_time">
-			<param name="no_quote" value="true" />
-			<param name="db_time_vetting_file" value="${tmp.dir}/.db.time.mini" />
-		</antcall>
-		<property file="${tmp.dir}/.db.time.mini" / -->
-
-		<!-- Browser stuff lives in a particular directory, as does apollo.  And they
-		are mutually exclusive.
-		-->
-		
-		<echo>player is ${player} </echo>
-
-		<!-- Exclude apollo tests if not using apollo. -->
-		<condition property="apollo_excludes" value="apollo/**/*.mxml" >
-			<not>
-				<istrue value="${use_apollo}" />
-			</not>
-		</condition>
-
-		<!-- Exclude browser tests if not using browser. -->
-		<condition property="browser_excludes" value="browser/**/*.mxml" >
-			<not>
-				<istrue value="${use_browser}" />
-			</not>
-		</condition>
-
-		<!-- Exclude apollo tests if using browser. -->
-		<condition property="apollo_excludes" value="apollo/**/*.mxml" >
-			<istrue value="${use_browser}" />
-		</condition>
-
-		<!-- Exclude mobile tests if not using mobile. -->
-		<condition property="mobile_excludes" value="mobile/**/*.mxml" >
-			<not>
-				<istrue value="${run_mobile_tests}" />
-			</not>
-		</condition>
-
-		<condition property="query.outfile" value="${mustella.dir}/lastrun.html" >
-			<equals arg1="${query.outfile}" arg2=""/>
-		</condition>
-
-		<condition property="query.outfile" value="${mustella.dir}/lastrun.html" >
-			<not>
-				<isset property="query.outfile" />
-			</not>
-		</condition>
-
-		<condition property="require_this_directory" value="**/*.mxml" >
-			<equals arg1="${require_this_directory_too}" arg2="" />
-		</condition>
+    <target name="setup" depends="get_date,get_os,setup_mac,setup_windows,setup_linux,db_time,handle_mobile_config,echo-browser,echo-apollo"  description="--> set platform specific properties">
+        <!-- antcall target="db_time">
+            <param name="no_quote" value="true" />
+            <param name="db_time_vetting_file" value="${tmp.dir}/.db.time.mini" />
+        </antcall>
+        <property file="${tmp.dir}/.db.time.mini" / -->
+
+        <!-- Browser stuff lives in a particular directory, as does apollo.  And they
+            are mutually exclusive.
+        -->
+        
+        <echo>player is ${player} </echo>
+
+        <!-- Exclude apollo tests if not using apollo. -->
+        <condition property="apollo_excludes" value="apollo/**/*.mxml" >
+            <not>
+                <istrue value="${use_apollo}" />
+            </not>
+        </condition>
+
+        <!-- Exclude browser tests if not using browser. -->
+        <condition property="browser_excludes" value="browser/**/*.mxml" >
+            <not>
+                <istrue value="${use_browser}" />
+            </not>
+        </condition>
+
+        <!-- Exclude apollo tests if using browser. -->
+        <condition property="apollo_excludes" value="apollo/**/*.mxml" >
+            <istrue value="${use_browser}" />
+        </condition>
+
+        <!-- Exclude mobile tests if not using mobile. -->
+        <condition property="mobile_excludes" value="mobile/**/*.mxml" >
+            <not>
+                <istrue value="${run_mobile_tests}" />
+            </not>
+        </condition>
+
+        <condition property="query.outfile" value="${mustella.dir}/lastrun.html" >
+            <equals arg1="${query.outfile}" arg2=""/>
+        </condition>
+
+        <condition property="query.outfile" value="${mustella.dir}/lastrun.html" >
+            <not>
+                <isset property="query.outfile" />
+            </not>
+        </condition>
+
+        <condition property="require_this_directory" value="**/*.mxml" >
+            <equals arg1="${require_this_directory_too}" arg2="" />
+        </condition>
 
         <!-- AJH 
-		<taskdef name="excluder" classname="mustella.GetExcludeIdsTask" classpathref="flex.test.classpath"/> -->
+        <taskdef name="excluder" classname="mustella.GetExcludeIdsTask" classpathref="flex.test.classpath"/> -->
 
-		<!-- get file level excludes -->
+        <!-- get file level excludes -->
         <!-- AJH
-		<antcall target="excluder_call" >
-			<param name="write" value="false"/>
-		</antcall> -->
-
-		<!-- antcall target="excludes_by_file" />
-		<loadfile srcFile="${mustella.dir}/tmpexc" property="other.mustella.excludes" >
-			<filterchain>
-			<linecontains negate="true">
-			<contains value="rows affected"/>
-			</linecontains>
-			<striplinebreaks/>
-			<replacestring from="/" to="${file.separator}"/>
-			</filterchain>
-		</loadfile-->
-
-		<fileset id="sdk.mustella.fileset" dir="${sdk.mustella.dir}"
-			includes="${sdk.mustella.includes}"
-			excludes="${sdk.mustella.excludes},**/SWFs/Components/*.mxml,**/Baselines/,**/baselines/,**/comps/*.mxml,**/Assets/**/*.swf,**/assets/**/*.swf,${browser_excludes},${apollo_excludes},${other.mustella.excludes},${apollo_specific_excludes},${mobile_excludes}" >
-			<filename name="${require_this_directory}" />
-		</fileset>
-
-		<fileset id="sdk.mustella.swffileset" dir="${sdk.mustella.dir}"
-			includes="${sdk.mustella.swfs}"
-			excludes="${sdk.mustella.excludes},**/Assets/**/*.swf,**/assets/**/*.swf" 
-		/>
-
-		<property name="showfiles" refid="sdk.mustella.fileset" />
-		<echo>fileset: ${showfiles}</echo>
-	</target>
-
-	<!-- exclude_filename is not used, since write = false. -->
-	<target name="excluder_call" unless="excludes_done" >
-		<excluder property="exclude_ids" type="${exclude_type}" filename="${exclude_filename}" branch="${branch_name}" os="${target_os_name}" browser="${browser_name}" apollo="${use_apollo}" bbrowser="${use_browser}" untilTime="${db_time}" write="false" excludeIds=""/>
-	</target>
+        <antcall target="excluder_call" >
+            <param name="write" value="false"/>
+        </antcall> -->
+
+        <!-- antcall target="excludes_by_file" />
+        <loadfile srcFile="${mustella.dir}/tmpexc" property="other.mustella.excludes" >
+            <filterchain>
+            <linecontains negate="true">
+            <contains value="rows affected"/>
+            </linecontains>
+            <striplinebreaks/>
+            <replacestring from="/" to="${file.separator}"/>
+            </filterchain>
+        </loadfile-->
+
+        <fileset id="sdk.mustella.fileset" dir="${sdk.mustella.dir}"
+            includes="${sdk.mustella.includes}"
+            excludes="${sdk.mustella.excludes},**/SWFs/Components/*.mxml,**/Baselines/,**/baselines/,**/comps/*.mxml,**/Assets/**/*.swf,**/assets/**/*.swf,${browser_excludes},${apollo_excludes},${other.mustella.excludes},${apollo_specific_excludes},${mobile_excludes}" >
+            <filename name="${require_this_directory}" />
+        </fileset>
+
+        <fileset id="sdk.mustella.swffileset" dir="${sdk.mustella.dir}"
+            includes="${sdk.mustella.swfs}"
+            excludes="${sdk.mustella.excludes},**/Assets/**/*.swf,**/assets/**/*.swf"/> 
+
+        <property name="showfiles" refid="sdk.mustella.fileset" />
+        <echo>fileset: ${showfiles}</echo>
+    </target>
 
+    <!-- exclude_filename is not used, since write = false. -->
+    <target name="excluder_call" unless="excludes_done" >
+        <excluder property="exclude_ids" type="${exclude_type}" filename="${exclude_filename}" branch="${branch_name}" os="${target_os_name}" browser="${browser_name}" apollo="${use_apollo}" bbrowser="${use_browser}" untilTime="${db_time}" write="false" excludeIds=""/>
+    </target>
 
      <property name="sdk.mustella.shellincludes" value="" />
      <property name="sdk.mustella.shellexcludes" value="" />
 
-
      <target name="build_shell_set" description=" create list of shell names">
 
         <!-- this gets all the .sh equiv files -->
@@ -605,223 +589,218 @@
 
 
      <target name="shells" depends="build_shell_set,chmod_shells" description=" Run user-shell scripts associated with these tests">
-	<!-- runs shell scripts in the test directories -->
-	<!-- make the set space-delimited -->
-
+        <!-- runs shell scripts in the test directories -->
+        <!-- make the set space-delimited -->
+    
         <pathconvert pathSep=" " dirsep="/" property="sdk.mustella.scripts2" >
-		<path path="${tmp.sdk.mustella.scripts2}" />
-	</pathconvert>
-	<exec  executable="${shell}" failonerror="${exit_on_compile_error}">
-		<arg value="${sdk.mustella.dir}/../scripts/shellrunner.sh" />
-    		<arg value="${sdk.mustella.scripts2}" />
-		<env key="SDK_DIR" value="${sdk.dir}" />
-    		<env key="MUSTELLA_DIR" value="${mustella.dir}" />
-    		<env key="USE_APOLLO" value="${use_apollo}" />
-    		<env key="APOLLO_TRANSFORM" value="${apollo_transform}" />
-	</exec>
-
+            <path path="${tmp.sdk.mustella.scripts2}" />
+        </pathconvert>
+        <exec  executable="${shell}" failonerror="${exit_on_compile_error}">
+            <arg value="${sdk.mustella.dir}/../scripts/shellrunner.sh" />
+                <arg value="${sdk.mustella.scripts2}" />
+            <env key="SDK_DIR" value="${sdk.dir}" />
+                <env key="MUSTELLA_DIR" value="${mustella.dir}" />
+                <env key="USE_APOLLO" value="${use_apollo}" />
+                <env key="APOLLO_TRANSFORM" value="${apollo_transform}" />
+        </exec>
      </target>
 
-
      <target name="chmod_shells" depends="build_shell_set" description=" make user-defined shells executatble">
-	<echo>changing user shell files to executable </echo>
-	<chmod perm="555" maxparallel="50">
-		<fileset dir="${mustella.dir}" >
-			<include name="**/*.sh" />
-        	</fileset>
-	</chmod>
-	<chmod perm="555" maxparallel="50">
-		<fileset dir="${mustella.dir}">
-			<include name="*.sh" />
-        	</fileset>
-	</chmod>
-     </target>
-
-
-    <target name="setHostName">
+        <echo>changing user shell files to executable </echo>
+        <chmod perm="555" maxparallel="50">
+            <fileset dir="${mustella.dir}" >
+                <include name="**/*.sh" />
+            </fileset>
+        </chmod>
+        <chmod perm="555" maxparallel="50">
+            <fileset dir="${mustella.dir}">
+                <include name="*.sh" />
+            </fileset>
+        </chmod>
     </target>
 
+    <target name="setHostName"/>
+
     <!-- property name="run_type" value="" / -->
     <property name="port" value="" />
     <property name="xmlnsVal" value="" />
 
+    <target name="getConfigId" unless="config_id" >
+        <taskdef name="getconfigidtask" classname="mustella.GetConfigIdTask" classpathref="flex.test.classpath"/>
+        <getconfigidtask  property="config_id" branch="${branch_name}" browser="${browser_name}" apollo="${use_apollo}" os="${target_os_name}"/>
+        <echo message="new config_id: ${config_id}" />
+    </target>
+
+    <target name="getActualRunId" unless="current.run.id" > 
+        <taskdef name="getrunidtask" classname="mustella.GetRunIdTask" classpathref="flex.test.classpath"/>
+        <getrunidtask  host="host" property="current.run.id" build="${build.id}" branch="${branch_name}" type="${run_type}" browserName="${browser_name}" config="${config_id}" swf="${version_fetcher}" player="${player}" time="${db_time}" os="${os}" osVersion="${os_version}" arch="${arch}"/>
+        <echo message="yo yo yo new id: ${current.run.id}" />
+        <echo file="${mustella.dir}/tests/runid.properties" append="false">run_id=${current.run.id}</echo>
+
+        <!-- read the file, make sure we match -->
+
+        <get ignoreerrors="true" src="http://localhost:${portNumber}/runid.properties"  dest="${mustella.dir}/junk1.properties" />
+        <property file="${mustella.dir}/junk1.properties" prefix="checkid" />
+
+        <condition property="exit_with_msg" value="true" >
+            <and>
+                <not>
+                    <equals arg1="${current.run.id}" arg2="${checkid.run_id}" />
+                </not>
+                <not>
+                    <equals arg1="${run_type}" arg2="mini" />
+                </not>
+            </and>
+        </condition>
+
+        <antcall target="sendConfigFailure" >
+        </antcall>
 
-	<target name="getConfigId" unless="config_id" >
-		<taskdef name="getconfigidtask" classname="mustella.GetConfigIdTask" classpathref="flex.test.classpath"/>
-		<getconfigidtask  property="config_id" branch="${branch_name}" browser="${browser_name}" apollo="${use_apollo}" os="${target_os_name}"/>
-		<echo message="new config_id: ${config_id}" />
-	</target>
-
-	<target name="getActualRunId" unless="current.run.id" >	
-		<taskdef name="getrunidtask" classname="mustella.GetRunIdTask" classpathref="flex.test.classpath"/>
-		<getrunidtask  host="host" property="current.run.id" build="${build.id}" branch="${branch_name}" type="${run_type}" browserName="${browser_name}" config="${config_id}" swf="${version_fetcher}" player="${player}" time="${db_time}" os="${os}" osVersion="${os_version}" arch="${arch}"/>
-		<echo message="yo yo yo new id: ${current.run.id}" />
-		<echo file="${mustella.dir}/tests/runid.properties" append="false">run_id=${current.run.id}</echo>
-
-		<!-- read the file, make sure we match -->
-
-		<get ignoreerrors="true" src="http://localhost:${portNumber}/runid.properties"  dest="${mustella.dir}/junk1.properties" />
-		<property file="${mustella.dir}/junk1.properties" prefix="checkid" />
-
-		<condition property="exit_with_msg" value="true" >
-			<and>
-				<not>
-					<equals arg1="${current.run.id}" arg2="${checkid.run_id}" />
-				</not>
-				<not>
-					<equals arg1="${run_type}" arg2="mini" />
-				</not>
-			</and>
-		</condition>
-
-		<antcall target="sendConfigFailure" >
-		</antcall>
-
-		<antcall target="do_fail" >
-			<param name="msg" value="Local web server not configured correctly!" />
-		</antcall>
-	</target>
+        <antcall target="do_fail" >
+            <param name="msg" value="Local web server not configured correctly!" />
+        </antcall>
+    </target>
 
-	<!-- This will figure out some device stuff. -->
+    <!-- This will figure out some device stuff. -->
     <condition property="do_handle_mobile_config" value="true" >
-		<istrue value="${run_mobile_tests}" />
+        <istrue value="${run_mobile_tests}" />
     </condition>
-	
-	<target name="handle_mobile_config" depends="get_mobile_data,device_fail" if="do_handle_mobile_config" >
-		<condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeList${os}.txt" >
-			<equals arg1="${run_mobile_tests}" arg2="true" />
-		</condition>
-		
-		<echo>os: ${os}</echo>
-		<echo>target_os_name: ${target_os_name}</echo>
-		<echo>os_version: ${os_version}</echo>
-		<echo>device_name: ${device_name}</echo>
-		<echo>use_android_runner: ${use_android_runner}</echo>
-		<echo>use_ios_runner: ${use_ios_runner}</echo>
-		<echo>use_qnx_runner: ${use_qnx_runner}</echo>
-		<echo>exclude_filename: ${exclude_filename}</echo>
-
-		<!-- Look for AIR and Android files. -->
-		<!--available file="${air.sdk.dir}/lib/aot/lib/AIRInterpreter" property="have_air_interpreter" />
-		<available file="${air.sdk.dir}/lib/aot/bin/as/arm-apple-darwin9-as" property="have_air_packager" />
-		<available file="${air.sdk.dir}/lib/adt.jar" property="have_air_adt_jar" />
-		<available file="${runtimeApk}" property="have_air_android_runtime" />
-		
-		<condition property="need_air_android">
-		    <and>
-			    <istrue value="${use_android_runner}" />
-			    <not>
-				    <istrue value="${have_air_android_runtime}" />
-			    </not>
-		    </and>
-		</condition>
-		
-		<condition property="need_air_ios">
-		    <and>
-			    <istrue value="${use_ios_runner}" />
-			    <or>
-				    <not>
-					    <istrue value="${have_air_interpreter}" />
-				    </not>
-				    <not>
-					    <istrue value="${have_air_packager}" />
-				    </not>
-				    <not>
-					    <istrue value="${have_air_adt_jar}" />
-				    </not>
-			    </or>
-		    </and>
-		</condition>
-		
-		<condition property="need_to_show_air_ios_fail_message">
-			<and>
-				<isset property="need_air_ios" />
-				<or>
-				    <not>
-					    <isset property="air.sdk.dir" />
-				    </not>
-				    <not>
-					    <isset property="air.sdk.version" />
-				    </not>
-				    <not>
-					    <isset property="air.sdk.build" />
-				    </not>				    
-				</or>
-			</and>
-		</condition>
-
-		<condition property="need_to_fetch_air_ios">
-			<and>
-				<isset property="need_air_ios" />
-				<isset property="air.sdk.dir" />
-				<isset property="air.sdk.build" />
-				<isset property="air.sdk.version" />
-			</and>
-		</condition>
-		
-		<antcall target="show_air_ios_fail_message" />
-		<antcall target="show_air_android_fail_message" />
-		<antcall target="fetch_air_ios" />
-		-->
-		
-		<!-- Look for the QNX SDK if we need to. -->
-		<available file="${qnx_sdk_dir}/bin" property="have_qnx_sdk" />
-		<condition property="need_qnx_sdk">
-			<and>
-				<istrue value="${use_qnx_runner}" />
-
-				<not>
-					<istrue value="${have_qnx_sdk}" />
-				</not>
-			</and>
-		</condition>		
-		<antcall target="fetch_qnx_sdk" />
-	</target>
-
-	<target name="fetch_qnx_sdk" if="need_qnx_sdk">
-		<echo>One or more of these is missing:</echo>
-		<echo>	${qnx_sdk_dir}</echo>
-		<fail message="A QNX SDK needs to be set correctly in the qnx_sdk_dir variable in local.properties." />
-	</target>
-
-	<target name="show_air_android_fail_message" if="need_air_android">
-		<echo>Required for Android run: ${runtimeApk}</echo>
-		<fail message="runtimeApk needs to be set to an AIR Runtime.apk file in local.properties." />
-	</target>
-
-	<target name="show_air_ios_fail_message" if="need_to_show_air_ios_fail_message">
-		<echo>One or more of these is missing:</echo>
-		<echo>	Required for iOs run: ${air.sdk.dir}/lib/aot/lib/AIRInterpreter</echo>
-		<echo>	Required for iOs run: ${air.sdk.dir}/lib/aot/bin/as/arm-apple-darwin9-as</echo>
-		<echo>	Required for iOs run: ${air.sdk.dir}/lib/adt.jar</echo>
-		<fail message="An AIR SDK for iOS needs to be set in local.properties." />
-	</target>
-
-	<target name="fetch_air_ios" if="need_to_fetch_air_ios">
-		<!-- Do the fetch from here *only* if air.sdk.version is set in local.properties. -->
-		<exec executable="${shell}">
-			<arg value="${mustella.dir}/scripts/fetch_air_build.sh" />
-			<arg value="${mustella.dir}" />
-			<arg value="${air.sdk.dir}" />
-			<arg value="${air.sdk.version}" />
-			<arg value="${air.sdk.build}" />						
-			<arg value="${realUser}" />
-			<arg value="${realPwd}" />
-		</exec>
-	</target>
-
-	<!-- Get mobile stuff. -->
-	<target name="get_mobile_data" if="do_handle_mobile_config">
-		<taskdef name="getdevicespecstask" classname="mustella.GetDeviceSpecsTask" classpathref="flex.test.classpath"/>
-		<getdevicespecstask androidSdk="${android_sdk}" runId="${run_id}" deviceName="${device_name}" mustellaDir="${mustella.dir}" />		
-	</target>
-
-	<!-- Fail if we could not get a version which we needed. -->
-	<target name="device_fail" if="get_mobile_data_fail">
-		<fail message="Some kind of device-related failure occurred."/>
-	</target>
+    
+    <target name="handle_mobile_config" depends="get_mobile_data,device_fail" if="do_handle_mobile_config" >
+        <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeList${os}.txt" >
+            <equals arg1="${run_mobile_tests}" arg2="true" />
+        </condition>
+        
+        <echo>os: ${os}</echo>
+        <echo>target_os_name: ${target_os_name}</echo>
+        <echo>os_version: ${os_version}</echo>
+        <echo>device_name: ${device_name}</echo>
+        <echo>use_android_runner: ${use_android_runner}</echo>
+        <echo>use_ios_runner: ${use_ios_runner}</echo>
+        <echo>use_qnx_runner: ${use_qnx_runner}</echo>
+        <echo>exclude_filename: ${exclude_filename}</echo>
+
+        <!-- Look for AIR and Android files. -->
+        <!--available file="${air.sdk.dir}/lib/aot/lib/AIRInterpreter" property="have_air_interpreter" />
+        <available file="${air.sdk.dir}/lib/aot/bin/as/arm-apple-darwin9-as" property="have_air_packager" />
+        <available file="${air.sdk.dir}/lib/adt.jar" property="have_air_adt_jar" />
+        <available file="${runtimeApk}" property="have_air_android_runtime" />
+        
+        <condition property="need_air_android">
+            <and>
+                <istrue value="${use_android_runner}" />
+                <not>
+                    <istrue value="${have_air_android_runtime}" />
+                </not>
+            </and>
+        </condition>
+        
+        <condition property="need_air_ios">
+            <and>
+                <istrue value="${use_ios_runner}" />
+                <or>
+                    <not>
+                        <istrue value="${have_air_interpreter}" />
+                    </not>
+                    <not>
+                        <istrue value="${have_air_packager}" />
+                    </not>
+                    <not>
+                        <istrue value="${have_air_adt_jar}" />
+                    </not>
+                </or>
+            </and>
+        </condition>
+        
+        <condition property="need_to_show_air_ios_fail_message">
+            <and>
+                <isset property="need_air_ios" />
+                <or>
+                    <not>
+                        <isset property="air.sdk.dir" />
+                    </not>
+                    <not>
+                        <isset property="air.sdk.version" />
+                    </not>
+                    <not>
+                        <isset property="air.sdk.build" />
+                    </not>                  
+                </or>
+            </and>
+        </condition>
+
+        <condition property="need_to_fetch_air_ios">
+            <and>
+                <isset property="need_air_ios" />
+                <isset property="air.sdk.dir" />
+                <isset property="air.sdk.build" />
+                <isset property="air.sdk.version" />
+            </and>
+        </condition>
+        
+        <antcall target="show_air_ios_fail_message" />
+        <antcall target="show_air_android_fail_message" />
+        <antcall target="fetch_air_ios" />
+        -->
+        
+        <!-- Look for the QNX SDK if we need to. -->
+        <available file="${qnx_sdk_dir}/bin" property="have_qnx_sdk" />
+        <condition property="need_qnx_sdk">
+            <and>
+                <istrue value="${use_qnx_runner}" />
+
+                <not>
+                    <istrue value="${have_qnx_sdk}" />
+                </not>
+            </and>
+        </condition>        
+        <antcall target="fetch_qnx_sdk" />
+    </target>
+
+    <target name="fetch_qnx_sdk" if="need_qnx_sdk">
+        <echo>One or more of these is missing:</echo>
+        <echo>  ${qnx_sdk_dir}</echo>
+        <fail message="A QNX SDK needs to be set correctly in the qnx_sdk_dir variable in local.properties." />
+    </target>
+
+    <target name="show_air_android_fail_message" if="need_air_android">
+        <echo>Required for Android run: ${runtimeApk}</echo>
+        <fail message="runtimeApk needs to be set to an AIR Runtime.apk file in local.properties." />
+    </target>
+
+    <target name="show_air_ios_fail_message" if="need_to_show_air_ios_fail_message">
+        <echo>One or more of these is missing:</echo>
+        <echo>  Required for iOs run: ${air.sdk.dir}/lib/aot/lib/AIRInterpreter</echo>
+        <echo>  Required for iOs run: ${air.sdk.dir}/lib/aot/bin/as/arm-apple-darwin9-as</echo>
+        <echo>  Required for iOs run: ${air.sdk.dir}/lib/adt.jar</echo>
+        <fail message="An AIR SDK for iOS needs to be set in local.properties." />
+    </target>
+
+    <target name="fetch_air_ios" if="need_to_fetch_air_ios">
+        <!-- Do the fetch from here *only* if air.sdk.version is set in local.properties. -->
+        <exec executable="${shell}">
+            <arg value="${mustella.dir}/scripts/fetch_air_build.sh" />
+            <arg value="${mustella.dir}" />
+            <arg value="${air.sdk.dir}" />
+            <arg value="${air.sdk.version}" />
+            <arg value="${air.sdk.build}" />                        
+            <arg value="${realUser}" />
+            <arg value="${realPwd}" />
+        </exec>
+    </target>
+
+    <!-- Get mobile stuff. -->
+    <target name="get_mobile_data" if="do_handle_mobile_config">
+        <taskdef name="getdevicespecstask" classname="mustella.GetDeviceSpecsTask" classpathref="flex.test.classpath"/>
+        <getdevicespecstask androidSdk="${android_sdk}" runId="${run_id}" deviceName="${device_name}" mustellaDir="${mustella.dir}" />      
+    </target>
+
+    <!-- Fail if we could not get a version which we needed. -->
+    <target name="device_fail" if="get_mobile_data_fail">
+        <fail message="Some kind of device-related failure occurred."/>
+    </target>
 
-	<!-- not sure about that unless -->
+    <!-- not sure about that unless -->
     <target name="getRunId" unless="current.run.id" depends="setbuildID,setHostName,getConfigId,getActualRunId"/>
 
     <target name="invokeVersion" depends="get_os,setup_mac,setup_windows,setup_linux" description="Fetch the flex version">
@@ -834,12 +813,12 @@
             includes="${sdk.mustella.includes}"
             excludes="${sdk.mustella.excludes},${other.mustella.excludes}" />
 
-	<target name="clean" depends="cleanswfs" description="--> cleanup old report and actual files">
-		<echo message="Deleting old results and files from previous testsuite build"/>
-		<delete dir="${mustellagen.dir}" quiet="true"/>
-		<!-- get rid of old runid prop file, in case we don't create a new one -->
-		<delete verbose="true" file="${mustella.dir}/tests/runid.properties" failonerror="false" quiet="true" />
-		<!-- delete file="${mustella.dir}/mustella.swc" failonerror="false"/ -->
+    <target name="clean" depends="cleanswfs" description="--> cleanup old report and actual files">
+        <echo message="Deleting old results and files from previous testsuite build"/>
+        <delete dir="${mustellagen.dir}" quiet="true"/>
+        <!-- get rid of old runid prop file, in case we don't create a new one -->
+        <delete verbose="true" file="${mustella.dir}/tests/runid.properties" failonerror="false" quiet="true" />
+        <!-- delete file="${mustella.dir}/mustella.swc" failonerror="false"/ -->
         <delete quiet="true" failonerror="false" includeEmptyDirs="true">
             <fileset dir="${sdk.mustella.dir}">
                 <include name="**/*.log"/>
@@ -852,19 +831,19 @@
     </target>
 
     <condition property="copy_adt_jar" value="true" >
-		<istrue value="${run_mobile_tests}" />
+        <istrue value="${run_mobile_tests}" />
     </condition>
 
-	<target name="prepare" unless="already_prepared" depends="handle_adt_jar" description="--> create test suite directories" >
-		<echo message="Preparing testsuite."/>
-		<mkdir dir="${sdk.dir}/lib"/>
-		<mkdir dir="${classes.dir}"/>
-		<ant antfile="${mustella.dir}/java/src/build.xml" target="compile-mustella" />
-	</target>
-	
-	<target name="handle_adt_jar" if="copy_adt_jar">
-		<copy file="${apollo_location}/lib/adt.jar" tofile="${mustella.dir}/lib/adt.jar" overwrite="true" />		
-	</target>
+    <target name="prepare" unless="already_prepared" depends="handle_adt_jar" description="--> create test suite directories" >
+        <echo message="Preparing testsuite."/>
+        <mkdir dir="${sdk.dir}/lib"/>
+        <mkdir dir="${classes.dir}"/>
+        <ant antfile="${mustella.dir}/java/src/build.xml" target="compile-mustella" />
+    </target>
+    
+    <target name="handle_adt_jar" if="copy_adt_jar">
+        <copy file="${apollo_location}/lib/adt.jar" tofile="${mustella.dir}/lib/adt.jar" overwrite="true" />        
+    </target>
 
     <target name="cleanswfs" unless="noclean.set" description="--> deletes all swfs and tag files">
         <delete quiet="true">
@@ -881,103 +860,98 @@
     <target name="set_exclude_flag" depends="prepare,setup" description="- set exclude flag on testcases">
         <pathconvert pathSep=";" property="sdk.mustella.files" refid="sdk.mustella.fileset"/>
         <java classname="mustella.ExcludeUtil" resultproperty="jreturn">
-          <classpath refid="flex.test.classpath"/>
-	  <sysproperty key="exclude" value="${exclude_flag}" />
-	  <sysproperty key="bugId" value="${bugId}" />
-	  <sysproperty key="exclude_id" value="${exclude_id}" />
-	  <sysproperty key="hard" value="${hard}" /> <!-- added -->
-          <arg value="${cmd_line_scriptName}" />
-          <arg value="${cmd_line_testcaseName}" />
-	</java>
-
-	<condition property="exit_with_msg" value="true" >
-          <not>
-		<equals arg1="0" arg2="${jreturn}" />
-          </not>
-	</condition>
-
-	<antcall target="do_fail" >
-		<param name="msg" value="Unable to exclude test case. Is it in the database?" />
-	</antcall>
+            <classpath refid="flex.test.classpath"/>
+            <sysproperty key="exclude" value="${exclude_flag}" />
+            <sysproperty key="bugId" value="${bugId}" />
+            <sysproperty key="exclude_id" value="${exclude_id}" />
+            <sysproperty key="hard" value="${hard}" /> <!-- added -->
+            <arg value="${cmd_line_scriptName}" />
+            <arg value="${cmd_line_testcaseName}" />
+        </java>
 
+        <condition property="exit_with_msg" value="true" >
+              <not>
+            <equals arg1="0" arg2="${jreturn}" />
+              </not>
+        </condition>
+        
+        <antcall target="do_fail" >
+            <param name="msg" value="Unable to exclude test case. Is it in the database?" />
+        </antcall>
     </target>
 
     <target name="do_fail" if="exit_with_msg">
-	<fail message="${msg}" />
+    <fail message="${msg}" />
     </target>
 
     <target name="re_include_test" depends="prepare,setup" description="- set flag to include testcases again">
         <pathconvert pathSep=";" property="sdk.mustella.files" refid="sdk.mustella.fileset"/>
         <java classname="mustella.ReInclude" >
-          <classpath refid="flex.test.classpath"/>
-          <arg value="${bugId}" />
-	</java>
+            <classpath refid="flex.test.classpath"/>
+            <arg value="${bugId}" />
+        </java>
     </target>
 
-
-
     <property name="skipped_insert_file" value="${mustella.dir}/testcases_notInserted.txt" />
     <property name="send_check_email" value="" />
     <property name="fail_at_testcase_check" value="" />
 
     <target name="insert_tests" depends="prepare,setup" description="--- insert testcases">
         <pathconvert pathSep=";" property="sdk.mustella.files" refid="sdk.mustella.fileset"/>
-    	<taskdef name="namesToFile" classname="mustella.WriteFileNames" classpathref="flex.test.classpath"/>
-	<namesToFile list="${sdk.mustella.files}" file="${mustella.dir}/test_files.tmp"/>
+        <taskdef name="namesToFile" classname="mustella.WriteFileNames" classpathref="flex.test.classpath"/>
+        <namesToFile list="${sdk.mustella.files}" file="${mustella.dir}/test_files.tmp"/>
         <pathconvert pathSep=";" property="sdk.mustella.files" refid="sdk.mustella.fileset"/>
-	<delete file="testcases_notInserted.txt" />
-	<echo>TESTCASE CHECK and INSERT TO DB</echo>
+        <delete file="testcases_notInserted.txt" />
+        <echo>TESTCASE CHECK and INSERT TO DB</echo>
         <java classname="mustella.InsertTestcase" fork="${fork_compile}" resultproperty="jreturn">
-          <classpath refid="flex.test.classpath"/>
-          <sysproperty key="skipped_insert_file" value="${skipped_insert_file}" />
-          <sysproperty key="debug_insert" value="${debug_insert}" />
-          <sysproperty key="fix_it_mode" value="${fix_it_mode}" />
-          <sysproperty key="do_move" value="${do_move}" />
-          <sysproperty key="old_file" value="${old_file}" />
-          <arg path="${mustella.dir}/test_files.tmp"/>
-          <!-- arg path="${sdk.mustella.files}"/ -->
-	</java>
-	<echo message="value of jreturn: ${jreturn}" />
-
-
-	<!--- backwards? shouldn't it be not on the zero? -->
-	<condition property="do_send_check" value="true" >
-		<and>
-			<not>
-          		<equals arg1="${jreturn}" arg2="0"/>
-			</not>
-          		<equals arg1="${send_check_email}" arg2="true"/>
-		</and>
-	</condition>
-
+            <classpath refid="flex.test.classpath"/>
+            <sysproperty key="skipped_insert_file" value="${skipped_insert_file}" />
+            <sysproperty key="debug_insert" value="${debug_insert}" />
+            <sysproperty key="fix_it_mode" value="${fix_it_mode}" />
+            <sysproperty key="do_move" value="${do_move}" />
+            <sysproperty key="old_file" value="${old_file}" />
+            <arg path="${mustella.dir}/test_files.tmp"/>
+            <!-- arg path="${sdk.mustella.files}"/ -->
+        </java>
+        <echo message="value of jreturn: ${jreturn}" />
+        
+        <!--- backwards? shouldn't it be not on the zero? -->
+        <condition property="do_send_check" value="true" >
+            <and>
+                <not>
+                    <equals arg1="${jreturn}" arg2="0"/>
+                </not>
+                    <equals arg1="${send_check_email}" arg2="true"/>
+            </and>
+        </condition>
+        
         <antcall target="sendCheckResults" />
-
-	<!-- NOT? -->
-	<condition property="exit_with_msg" value="true" >
-		<and>
-          		<equals arg1="${jreturn}" arg2="0"/>
-          		<equals arg1="${fail_on_testcase_check}" arg2="true"/>
-		</and>
-	</condition>
-
-	<antcall target="do_fail" >
-		<param name="msg" value="Testcase check failed." />
-	</antcall>
-
-	<echo>Return was okay from test case check</echo>
-
+        
+        <!-- NOT? -->
+        <condition property="exit_with_msg" value="true" >
+            <and>
+                <equals arg1="${jreturn}" arg2="0"/>
+                <equals arg1="${fail_on_testcase_check}" arg2="true"/>
+            </and>
+        </condition>
+        
+        <antcall target="do_fail" >
+            <param name="msg" value="Testcase check failed." />
+        </antcall>
+        
+        <echo>Return was okay from test case check</echo>        
     </target>
 
     <target name="sendConfigFailure" if="exit_with_msg">
-	<echo file="${mustella.dir}/config.txt">Test Server: Config Failure (web server root) for ${host}</echo>
-	<java classname="utils.HtmlNotify">
-		<classpath refid="flex.test.classpath"/>
-		<arg value="${mustella.dir}/config.txt" />
-		<arg value="inner-relay-1.corp.adobe.com"/>
-	        <arg value="Mustella Config Check Failure - ${branch}" />
-		<arg value="mustella tester &lt;bolaughl@adobe.com&gt;"/>
-		<arg value="bolaughl@adobe.com" />
-	</java>
+        <echo file="${mustella.dir}/config.txt">Test Server: Config Failure (web server root) for ${host}</echo>
+        <java classname="utils.HtmlNotify">
+            <classpath refid="flex.test.classpath"/>
+            <arg value="${mustella.dir}/config.txt" />
+            <arg value="inner-relay-1.corp.adobe.com"/>
+            <arg value="Mustella Config Check Failure - ${branch}" />
+            <arg value="mustella tester &lt;bolaughl@adobe.com&gt;"/>
+            <arg value="bolaughl@adobe.com" />
+        </java>
     </target>
 
     <property name="socket_mixin" value="" />
@@ -990,9 +964,9 @@
     <property name="test_files" value="" />
 
     <condition property="user_args" value="" >
-	<not>
-		<isset property="user_args" />
-	</not>
+        <not>
+            <isset property="user_args" />
+        </not>
     </condition>
 
 
@@ -1001,9 +975,9 @@
     <property name="exit_include" value="" />
 
     <condition property="get_results_from_log" value="true" else="false" >
-	<not>
-		<isset property="${run_mobile_tests}" />
-	</not>
+        <not>
+            <isset property="${run_mobile_tests}" />
+        </not>
     </condition>
 
     <property name="build_version" value="${server}" />
@@ -1013,408 +987,368 @@
         <fileset id="sdk.mustella.swffileset" dir="${sdk.mustella.dir}"
             includes="${sdk.mustella.swfs}"
             excludes="${sdk.mustella.excludes},**/Assets/**/*.swf,**/assets/**/*.swf" />
-
-	<property name="showit0" refid="sdk.mustella.swffileset" />
-	<echo>stuff: ${showit0}</echo>
+    
+        <property name="showit0" refid="sdk.mustella.swffileset" />
+        <echo>stuff: ${showit0}</echo>
     </target>
-	
-
-
+    
     <target name="fast_compile_filesets" depends="get_os,setup_mac,setup_windows,setup_linux">
 
-	<property file="${basedir}/properties/mustella1.properties" />
-
-	<condition property="apollo_excludes" value="apollo/**/*.mxml" >
-		<not>
-			<istrue value="${use_apollo}" />
-		</not>
-	</condition>
-
-	<condition property="browser_excludes" value="browser/**/*.mxml" >
-		<not>
-			<istrue value="${use_browser}" />
-		</not>
-	</condition>
-
-
-	<condition property="apollo_excludes" value="apollo/**/*.mxml" >
-		<istrue value="${use_browser}" />
-	</condition>
-
-
+        <property file="${basedir}/properties/mustella1.properties" />
+    
+        <condition property="apollo_excludes" value="apollo/**/*.mxml" >
+            <not>
+                <istrue value="${use_apollo}" />
+            </not>
+        </condition>
+    
+        <condition property="browser_excludes" value="browser/**/*.mxml" >
+            <not>
+                <istrue value="${use_browser}" />
+            </not>
+        </condition>
+    
+        <condition property="apollo_excludes" value="apollo/**/*.mxml" >
+            <istrue value="${use_browser}" />
+        </condition>
+    
         <fileset id="sdk.mustella.fileset" dir="${sdk.mustella.dir}" 
-		includes="${sdk.mustella.includes}" 
-                excludes="${sdk.mustella.excludes},**/baselines/,**/Baselines/,**/comps/*.mxml,**/Assets/**/*.swf,**/assets/**/*.swf, ${browser_excludes},${apollo_excludes},${other.mustella.excludes},${apollo_specific_excludes}" >
-	
+            includes="${sdk.mustella.includes}" 
+            excludes="${sdk.mustella.excludes},**/baselines/,**/Baselines/,**/comps/*.mxml,**/Assets/**/*.swf,**/assets/**/*.swf, ${browser_excludes},${apollo_excludes},${other.mustella.excludes},${apollo_specific_excludes}" >
         </fileset>
-	<property name="tmp.showfiles" refid="sdk.mustella.fileset" />
-	<echo file="${mustella.dir}/junk1a">${tmp.showfiles}</echo>
-	<echo>stuff: ${tmp.showfiles}</echo>
+        <property name="tmp.showfiles" refid="sdk.mustella.fileset" />
+        <echo file="${mustella.dir}/junk1a">${tmp.showfiles}</echo>
+        <echo>stuff: ${tmp.showfiles}</echo>
     </target>
 
-
     <target name="realCompile" depends="compilemustellaswc" description="- mxmlc call to compile mustella test swfs" if="sdk.mustella.includes">
-	    <delete quiet="true">
-		    <fileset dir="${sdk.dir}/frameworks/componentSmoke" includes="*.cache"/>
-	    </delete>
+        <delete quiet="true">
+            <fileset dir="${sdk.dir}/frameworks/componentSmoke" includes="*.cache"/>
+        </delete>
         <property name="frameworks.dir" value="${mustella.dir}/../frameworks" />
         <property name="mxmlc.dir" value="${sdk.dir}/bin" />
         <!-- property name="mxmlc.exe" value="mxmlc.exe" / -->
         <!-- remove? property name="pfchange" value="workspace" / -->
         <pathconvert pathSep=";" property="sdk.mustella.mxmlfiles" refid="sdk.mustella.fileset"/>
 
-	<!-- echo>stuff we're passing into compile: ${sdk.mustella.mxmlfiles}</echo -->
-
-	<!-- echo>Shell is currently ${shell}</echo -->
-	<antcall target="shells" />
-
-	<!-- write the target files to a file -->
-    <taskdef name="namesToFile" classname="mustella.WriteFileNames" classpathref="flex.test.classpath"/>
-	<namesToFile list="${sdk.mustella.mxmlfiles}" file="${mustella.dir}/test_files.tmp"/>
-
-	<java classname="mustella.CompileMustellaSwfs" fork="${fork_compile}" resultproperty="jreturn" >
-		<classpath refid="flex.test.classpath"/>
-		<sysproperty key="mxmlcdir" value="${mxmlc.dir}" />
-		<sysproperty key="mxmlcexe" value="${mxmlc.exe}" />
-		<sysproperty key="sdk.mustella.dir" value="${sdk.mustella.dir}"/>
-		<sysproperty key="sdk.dir" value="${sdk.dir}"/>
-		<sysproperty key="mustella_framework_dir" value="${mustella_framework_dir}" />
-		<sysproperty key="run_id" value="${current.run.id}" />
-		<sysproperty key="frameworks" value="${frameworks.dir}" />
-		<sysproperty key="compc" value="${compc}" />
-		<sysproperty key="compcexe" value="${compc.exe}" />
-		<sysproperty key="strict" value="${strict}"/>
-		<sysproperty key="index" value="${index}"/>
-		<sysproperty key="compcdir" value="${compc.dir}" />
-		<sysproperty key="mxmlc.args" value="${mxmlc.args} -source-path=${mustella.dir}/Assets "/>
-		<sysproperty key="rsl" value="${rsl}" />
-		<sysproperty key="build" value="${build}"/>
-		<sysproperty key="debug" value="${debug}"/>
-		<sysproperty key="exit_on_compile_error" value="${exit_on_compile_error}" />
-		<sysproperty key="save_failures" value="${save_failures}" />
-		<sysproperty key="use_apollo" value="${use_apollo}" />
-		<sysproperty key="apollo_location" value="${apollo_location}" />
-		<sysproperty key="excludelibrarypath" value="${excludelibrarypath}"/>
-		<sysproperty key="external.librarypath" value="${external.librarypath}"/>
-		<sysproperty key="basedir" value="${mustella.dir}"/>
-		<sysproperty key="incremental" value="false" />
-		<sysproperty key="asclasspath" value="${asclasspath},${aschartspath}"/>
-		<sysproperty key="librarypath" value="${librarypath}"/>
-		<sysproperty key="coach" value="${coach}"/>
-		<sysproperty key="feature" value="${feature}"/>
-		<sysproperty key="run_this_script" value="${run_this_script}"/>
-		<sysproperty key="socket_mixin" value="${socket_mixin}" />
-		<sysproperty key="use_mustella_framework_dir" value="${use_mustella_framework_dir}" />
-		<sysproperty key="socket_mixin" value="${socket_mixin}" />
-		<sysproperty key="fork_compile" value="${fork_compile}" />
-		<sysproperty key="include_list" value="${include_list}" />
-		<sysproperty key="mustella.dir" value="${mustella.dir}" />
-		<sysproperty key="use_browser" value="${use_browser}" />
-		<sysproperty key="htmlDir" value="${htmlDir}" />
-		<sysproperty key="skip_exclude" value="${skip_exclude}" />
-		<sysproperty key="apollo_transform" value="${apollo_transform}" />
-		<sysproperty key="apollo_transform_template" value="${apollo_transform_template}" />
-		<sysproperty key="apollo_transform_prefix" value="${apollo_transform_prefix}" />
-		<sysproperty key="apollo_transform_prefix2" value="${apollo_transform_prefix2}" />
-		<sysproperty key="use_include_file" value="${use_include_file}" />
-		<sysproperty key="user_args" value="${user_args}" />
-		<sysproperty key="flex_version" value="${flex_version}" />
-		<sysproperty key="build_version" value="${build_version}" />
-		<sysproperty key="result_include" value="${result_include}" />
-		<sysproperty key="exit_include" value="${exit_include}" />
-		<sysproperty key="exclude_mixin" value="${exclude_mixin}" />
-		<sysproperty key="exclude_source_path" value="${exclude_source_path}" />
-		<sysproperty key="mustellaswc" value="${mustella.swc.dir}/${mustella.swc.name}" />
-		<sysproperty key="pmd" value="${pmd}" />
-		<sysproperty key="distributed" value="${distributed}" />
-		<sysproperty key="compile_dir" value="${compile_dir}" />
-		<sysproperty key="compile_id" value="${compile_id}" />
-		<sysproperty key="hostId" value="${hostId}" />
-		<sysproperty key="run_mobile_tests" value="${run_mobile_tests}" />		
-		<sysproperty key="device_name" value="${device_name}" />
-		<sysproperty key="target_os_name" value="${target_os_name}" />
-		<sysproperty key="os_version" value="${os_version}" />
-		<sysproperty key="exclude_filename" value="${exclude_filename}" />
-		<sysproperty key="adl_extras" value="${adl_extras}" />
-		<arg path="${mustella.dir}/test_files.tmp"/>
-	</java>
-
-	<echo message="compileswfs jreturn is ${jreturn}" />
-	<!-- handle the bad return -->
-
-	<condition property="always_send" value="true" >
-		<and>
-          		<equals arg1="${jreturn}" arg2="1"/>
-			<not>
-          		<equals arg1="${current.run.id}" arg2="-1"/>
-			</not>
-		</and>
-	</condition>
-
-	<condition property="exit_with_msg" value="true" >
-		<and>
-          		<equals arg1="${jreturn}" arg2="1"/>
-          		<equals arg1="${exit_on_compile_error}" arg2="true"/>
-		</and>
-	</condition>
-
-
-	<antcall target="do_fail" >
-		<param name="msg" value="SWF compile failed. Exiting" />
-	</antcall>
-
-
+        <!-- echo>stuff we're passing into compile: ${sdk.mustella.mxmlfiles}</echo -->
+    
+        <!-- echo>Shell is currently ${shell}</echo -->
+        <antcall target="shells" />
+    
+        <!-- write the target files to a file -->
+        <taskdef name="namesToFile" classname="mustella.WriteFileNames" classpathref="flex.test.classpath"/>
+        <namesToFile list="${sdk.mustella.mxmlfiles}" file="${mustella.dir}/test_files.tmp"/>
+    
+        <java classname="mustella.CompileMustellaSwfs" fork="${fork_compile}" resultproperty="jreturn" >
+            <classpath refid="flex.test.classpath"/>
+            <sysproperty key="mxmlcdir" value="${mxmlc.dir}" />
+            <sysproperty key="mxmlcexe" value="${mxmlc.exe}" />
+            <sysproperty key="sdk.mustella.dir" value="${sdk.mustella.dir}"/>
+            <sysproperty key="sdk.dir" value="${sdk.dir}"/>
+            <sysproperty key="mustella_framework_dir" value="${mustella_framework_dir}" />
+            <sysproperty key="run_id" value="${current.run.id}" />
+            <sysproperty key="frameworks" value="${frameworks.dir}" />
+            <sysproperty key="compc" value="${compc}" />
+            <sysproperty key="compcexe" value="${compc.exe}" />
+            <sysproperty key="strict" value="${strict}"/>
+            <sysproperty key="index" value="${index}"/>
+            <sysproperty key="compcdir" value="${compc.dir}" />
+            <sysproperty key="mxmlc.args" value="${mxmlc.args} -source-path=${mustella.dir}/Assets "/>
+            <sysproperty key="rsl" value="${rsl}" />
+            <sysproperty key="build" value="${build}"/>
+            <sysproperty key="debug" value="${debug}"/>
+            <sysproperty key="exit_on_compile_error" value="${exit_on_compile_error}" />
+            <sysproperty key="save_failures" value="${save_failures}" />
+            <sysproperty key="use_apollo" value="${use_apollo}" />
+            <sysproperty key="apollo_location" value="${apollo_location}" />
+            <sysproperty key="excludelibrarypath" value="${excludelibrarypath}"/>
+            <sysproperty key="external.librarypath" value="${external.librarypath}"/>
+            <sysproperty key="basedir" value="${mustella.dir}"/>
+            <sysproperty key="incremental" value="false" />
+            <sysproperty key="asclasspath" value="${asclasspath},${aschartspath}"/>
+            <sysproperty key="librarypath" value="${librarypath}"/>
+            <sysproperty key="coach" value="${coach}"/>
+            <sysproperty key="feature" value="${feature}"/>
+            <sysproperty key="run_this_script" value="${run_this_script}"/>
+            <sysproperty key="socket_mixin" value="${socket_mixin}" />
+            <sysproperty key="use_mustella_framework_dir" value="${use_mustella_framework_dir}" />
+            <sysproperty key="socket_mixin" value="${socket_mixin}" />
+            <sysproperty key="fork_compile" value="${fork_compile}" />
+            <sysproperty key="include_list" value="${include_list}" />
+            <sysproperty key="mustella.dir" value="${mustella.dir}" />
+            <sysproperty key="use_browser" value="${use_browser}" />
+            <sysproperty key="htmlDir" value="${htmlDir}" />
+            <sysproperty key="skip_exclude" value="${skip_exclude}" />
+            <sysproperty key="apollo_transform" value="${apollo_transform}" />
+            <sysproperty key="apollo_transform_template" value="${apollo_transform_template}" />
+            <sysproperty key="apollo_transform_prefix" value="${apollo_transform_prefix}" />
+            <sysproperty key="apollo_transform_prefix2" value="${apollo_transform_prefix2}" />
+            <sysproperty key="use_include_file" value="${use_include_file}" />
+            <sysproperty key="user_args" value="${user_args}" />
+            <sysproperty key="flex_version" value="${flex_version}" />
+            <sysproperty key="build_version" value="${build_version}" />
+            <sysproperty key="result_include" value="${result_include}" />
+            <sysproperty key="exit_include" value="${exit_include}" />
+            <sysproperty key="exclude_mixin" value="${exclude_mixin}" />
+            <sysproperty key="exclude_source_path" value="${exclude_source_path}" />
+            <sysproperty key="mustellaswc" value="${mustella.swc.dir}/${mustella.swc.name}" />
+            <sysproperty key="pmd" value="${pmd}" />
+            <sysproperty key="distributed" value="${distributed}" />
+            <sysproperty key="compile_dir" value="${compile_dir}" />
+            <sysproperty key="compile_id" value="${compile_id}" />
+            <sysproperty key="hostId" value="${hostId}" />
+            <sysproperty key="run_mobile_tests" value="${run_mobile_tests}" />      
+            <sysproperty key="device_name" value="${device_name}" />
+            <sysproperty key="target_os_name" value="${target_os_name}" />
+            <sysproperty key="os_version" value="${os_version}" />
+            <sysproperty key="exclude_filename" value="${exclude_filename}" />
+            <sysproperty key="adl_extras" value="${adl_extras}" />
+            <arg path="${mustella.dir}/test_files.tmp"/>
+        </java>
+    
+        <echo message="compileswfs jreturn is ${jreturn}" />
+        <!-- handle the bad return -->
+    
+        <condition property="always_send" value="true" >
+            <and>
+                    <equals arg1="${jreturn}" arg2="1"/>
+                <not>
+                    <equals arg1="${current.run.id}" arg2="-1"/>
+                </not>
+            </and>
+        </condition>
+    
+        <condition property="exit_with_msg" value="true" >
+            <and>
+                    <equals arg1="${jreturn}" arg2="1"/>
+                    <equals arg1="${exit_on_compile_error}" arg2="true"/>
+            </and>
+        </condition>
+    
+        <antcall target="do_fail" >
+            <param name="msg" value="SWF compile failed. Exiting" />
+        </antcall>    
     </target>
 
     <target name="compileLite" depends="prepare,setup,getRunId,getExcludes,realCompile" description="- compile the mustella tests into swfs">
 
-	<antcall target="continue_always_send" />
-	<!-- consider if we want to use mustella as a swc? -->
+    <antcall target="continue_always_send" />
+    <!-- consider if we want to use mustella as a swc? -->
     </target>
 
     <target name="continue_always_send" if="always_send" >
-	<antcall target="queryOnly" />
-	<antcall target="do_sendResults" />
+        <antcall target="queryOnly" />
+        <antcall target="do_sendResults" />
     </target>
 
-
     <target name="zip_small"  depends="compileLite,zipLite" description="- compile/package subset of tests">
     </target>
 
     <target name="zipLite"  description="- package test swfs">
 
-	<!-- 	this should zip only the result of the compile; so we should call a shell script
-		to figure out the diff and only zip that. This, in short, becomes an exec
-	  -->	
+        <!--    this should zip only the result of the compile; so we should call a shell script
+                to figure out the diff and only zip that. This, in short, becomes an exec
+        -->   
 
     </target>
 
-
-
     <property name="testpkg" value="testpkg.zip" />
 
-    <target name="zipswfs"  depends="compileLite,ziponly" description="- package test swfs">
-    </target>
+    <target name="zipswfs"  depends="compileLite,ziponly" description="- package test swfs"/>
 
     <target name="ziponly"  description="- package test swfs">
 
-	<!-- actual location should be build number(directory) with packages in it   -->
-	<property file="${mustella.dir}/successfulBuild.properties" />
-	<echo>This is the build I'm acting on ${server}</echo>
-	<mkdir dir="${tmp.dir}/flex/${server}" />
-	<zip destfile="${tmp.dir}/flex/${server}/${testpkg}" >
-		<fileset refid="sdk.mustella.swffileset" />
-	</zip>
-	<copy verbose="true" file="${mustella.dir}/successfulBuild.properties" todir="${tmp.dir}/flex" />
-    	<copy verbose="true" file="${mustella.dir}/${langZip}" todir="${tmp.dir}/flex/${server}" />
-	<copy verbose="true" file="${mustella.dir}/${mainZip}" todir="${tmp.dir}/flex/${server}" />
-	<copy verbose="true" file="${db_time_file}" todir="${tmp.dir}/flex/${server}" />
-	<copy verbose="true" file="${server_time_file}" todir="${tmp.dir}/flex/${server}" />
-
+        <!-- actual location should be build number(directory) with packages in it   -->
+        <property file="${mustella.dir}/successfulBuild.properties" />
+        <echo>This is the build I'm acting on ${server}</echo>
+        <mkdir dir="${tmp.dir}/flex/${server}" />
+        <zip destfile="${tmp.dir}/flex/${server}/${testpkg}" >
+            <fileset refid="sdk.mustella.swffileset" />
+        </zip>
+        <copy verbose="true" file="${mustella.dir}/successfulBuild.properties" todir="${tmp.dir}/flex" />
+            <copy verbose="true" file="${mustella.dir}/${langZip}" todir="${tmp.dir}/flex/${server}" />
+        <copy verbose="true" file="${mustella.dir}/${mainZip}" todir="${tmp.dir}/flex/${server}" />
+        <copy verbose="true" file="${db_time_file}" todir="${tmp.dir}/flex/${server}" />
+        <copy verbose="true" file="${server_time_file}" todir="${tmp.dir}/flex/${server}" />
     </target>
 
-
-
-
     <property name="work_table" value="hurricane_work_list" />
 
-
     <target name="update_volatiles" >
 
-	<!-- check for a latest full test run -->
-	<property prefix="current.win." file="${mustella.dir}/external/win.runid.properties" />
-	<property prefix="current.mac." file="${mustella.dir}/external/mac.runid.properties" />
-
-
-	<antcall target="fetch_old_runid">
-		<param name="arg.propertyfile" value="${mustella.dir}/external/win.runid.properties.tmp" />
-		<param name="arg.os" value="%Windows%" />
-	</antcall>
-
-	<antcall target="fetch_old_runid">
-		<param name="arg.propertyfile" value="${mustella.dir}/external/mac.runid.properties.tmp" />
-		<param name="arg.os" value="%Mac%" />
-	</antcall>
-
-	<property file="${mustella.dir}/external/win.runid.properties.tmp" prefix="win."/>
-	<property file="${mustella.dir}/external/mac.runid.properties.tmp" prefix="mac."/>
-
-	<echo>compare arg1="${current.win.run_id}" arg2="${win.run_id}"</echo>
-	<echo>compare arg1="${current.mac.run_id}" arg2="${mac.run_id}"</echo>
-
-
-	<condition property="update_excludes" value="true" >
-		<or>
-		<not>
-		<equals arg1="${current.win.run_id}" arg2="${win.run_id}" />
-		</not>
-		<not>
-		<equals arg1="${current.mac.run_id}" arg2="${mac.run_id}" />
-		</not>
-		</or>
-	</condition>
-
-
-	<!-- call the excludes/failures guy for win -->
-	<antcall target="do_excludes_update">
-		<param name="arg.excludes_filename" value="${mustella.dir}/external/ExcludeListWin.txt" />
-		<param name="arg.failures_filename" value="${mustella.dir}/external/failures.win.out" />
-		<param name="arg.runid_filename" value="${mustella.dir}/external/win.runid.properties" />
-		<param name="arg.run_id" value="${win.run_id}" />
-		<param name="arg.prefix" value="win.db." />
-		<param name="arg.target_os_name" value="windows" />
-	</antcall>
-
-
-	<!-- call the excludes/failures guy for mac -->
-	<antcall target="do_excludes_update">
-		<param name="arg.excludes_filename" value="${mustella.dir}/external/ExcludeListMac.txt" />
-		<param name="arg.failures_filename" value="${mustella.dir}/external/failures.mac.out" />
-		<param name="arg.runid_filename" value="${mustella.dir}/external/mac.runid.properties" />
-		<param name="arg.run_id" value="${mac.run_id}" />
-		<param name="arg.prefix" value="mac.db." />
-		<param name="arg.target_os_name" value="mac" />
-	</antcall>
-
-
-	<uptodate property="jar_not_needed" targetfile="${mustella.dir}/external/mustella.jar">
-		<srcfiles dir="${mustella.dir}/src/" includes="mustella/*.java,utils/*.java" />
-	</uptodate>
-
-
-	<echo>Jar update not needed? ${jar_not_needed}</echo>
-
-	<antcall target="do_jar_update" />
-
-	<uptodate property="swc_not_needed" targetfile="${mustella.dir}/external/mustella.swc">
-		<srcfiles dir="${mustella.dir}/frameworks/mustella/" includes="*.as" />
-	</uptodate>
-
-	<echo>SWC update not needed? ${swc_not_needed}</echo>
-
-	<antcall target="do_swc_update" />
-
-
-
-	<!-- check in whatever is new -->
-	<p4change description="updates for excludes,failures,etc " />
-	<echo> p4change: ${p4.change}</echo>
-
-	<!-- p4reopen tochange="${p4.change}" view="//depot/flex/qa/sdk/testsuites/mustella/external/..." / -->
-	<p4edit change="${p4.change}" view="//depot/flex/qa/sdk/testsuites/mustella/external/..." />
-	<p4revert revertOnlyUnchanged="true" change="${p4.change}" />
-	<p4submit change="${p4.change}" />
-
+        <!-- check for a latest full test run -->
+        <property prefix="current.win." file="${mustella.dir}/external/win.runid.properties" />
+        <property prefix="current.mac." file="${mustella.dir}/external/mac.runid.properties" />
+    
+        <antcall target="fetch_old_runid">
+            <param name="arg.propertyfile" value="${mustella.dir}/external/win.runid.properties.tmp" />
+            <param name="arg.os" value="%Windows%" />
+        </antcall>
+    
+        <antcall target="fetch_old_runid">
+            <param name="arg.propertyfile" value="${mustella.dir}/external/mac.runid.properties.tmp" />
+            <param name="arg.os" value="%Mac%" />
+        </antcall>
+    
+        <property file="${mustella.dir}/external/win.runid.properties.tmp" prefix="win."/>
+        <property file="${mustella.dir}/external/mac.runid.properties.tmp" prefix="mac."/>
+    
+        <echo>compare arg1="${current.win.run_id}" arg2="${win.run_id}"</echo>
+        <echo>compare arg1="${current.mac.run_id}" arg2="${mac.run_id}"</echo>
+    
+        <condition property="update_excludes" value="true" >
+            <or>
+                <not>
+                    <equals arg1="${current.win.run_id}" arg2="${win.run_id}" />
+                </not>
+                <not>
+                    <equals arg1="${current.mac.run_id}" arg2="${mac.run_id}" />
+                </not>
+            </or>
+        </condition>
+    
+        <!-- call the excludes/failures guy for win -->
+        <antcall target="do_excludes_update">
+            <param name="arg.excludes_filename" value="${mustella.dir}/external/ExcludeListWin.txt" />
+            <param name="arg.failures_filename" value="${mustella.dir}/external/failures.win.out" />
+            <param name="arg.runid_filename" value="${mustella.dir}/external/win.runid.properties" />
+            <param name="arg.run_id" value="${win.run_id}" />
+            <param name="arg.prefix" value="win.db." />
+            <param name="arg.target_os_name" value="windows" />
+        </antcall>
+    
+        <!-- call the excludes/failures guy for mac -->
+        <antcall target="do_excludes_update">
+            <param name="arg.excludes_filename" value="${mustella.dir}/external/ExcludeListMac.txt" />
+            <param name="arg.failures_filename" value="${mustella.dir}/external/failures.mac.out" />
+            <param name="arg.runid_filename" value="${mustella.dir}/external/mac.runid.properties" />
+            <param name="arg.run_id" value="${mac.run_id}" />
+            <param name="arg.prefix" value="mac.db." />
+            <param name="arg.target_os_name" value="mac" />
+        </antcall>
+    
+        <uptodate property="jar_not_needed" targetfile="${mustella.dir}/external/mustella.jar">
+            <srcfiles dir="${mustella.dir}/src/" includes="mustella/*.java,utils/*.java" />
+        </uptodate>
+    
+        <echo>Jar update not needed? ${jar_not_needed}</echo>
+    
+        <antcall target="do_jar_update" />
+    
+        <uptodate property="swc_not_needed" targetfile="${mustella.dir}/external/mustella.swc">
+            <srcfiles dir="${mustella.dir}/frameworks/mustella/" includes="*.as" />
+        </uptodate>
+    
+        <echo>SWC update not needed? ${swc_not_needed}</echo>
+    
+        <antcall target="do_swc_update" />
+    
+        <!-- check in whatever is new -->
+        <p4change description="updates for excludes,failures,etc " />
+        <echo> p4change: ${p4.change}</echo>
+    
+        <!-- p4reopen tochange="${p4.change}" view="//depot/flex/qa/sdk/testsuites/mustella/external/..." / -->
+        <p4edit change="${p4.change}" view="//depot/flex/qa/sdk/testsuites/mustella/external/..." />
+        <p4revert revertOnlyUnchanged="true" change="${p4.change}" />
+        <p4submit change="${p4.change}" />
     </target>
 
 
     <target name="do_jar_update" unless="jar_not_needed" >
-
-	<delete verbose="true" file="${mustella.dir}/external/mustella.jar" />
-	<jar basedir="${mustella.dir}/classes" destfile="${mustella.dir}/external/mustella.jar" includes="mustella/*.class,utils/*.class"/>
-
-
+        <delete verbose="true" file="${mustella.dir}/external/mustella.jar" />
+        <jar basedir="${mustella.dir}/classes" destfile="${mustella.dir}/external/mustella.jar" includes="mustella/*.class,utils/*.class"/>
     </target>
 
     <target name="do_swc_update" unless="swc_not_needed" >
 
-	<!-- this call needs some variables set setup, so, say excludes are done to avoid that nested call -->
-	<antcall target="makemustellaswc"  >
-		<param name="excludes_done" value="true" />
-	</antcall>
-	<copy overwrite="true" verbose="true" file="${mustella.dir}/${mustella.swc.name}" todir="${mustella.dir}/external" />
-
+        <!-- this call needs some variables set setup, so, say excludes are done to avoid that nested call -->
+        <antcall target="makemustellaswc"  >
+            <param name="excludes_done" value="true" />
+        </antcall>
+        <copy overwrite="true" verbose="true" file="${mustella.dir}/${mustella.swc.name}" todir="${mustella.dir}/external" />
     </target>
 
-
-
     <!-- this target can be run after a regular, full test run, to pkg tests, excludes, and a failure list -->
     <target name="zip_tests_only"  depends="makemustellaswc" description="- package tests,jars,excludes, and results">
 
-	<!-- assumption: we have a runid; we need it to get the failures relevant to the current build -->
-	<property file="${mustella.dir}/tests/runid.properties" />
-	<property name="current.run.id" value="${run_id}" />
-
-	<echo>run id is ${current.run.id} </echo>
-
-	<!-- we need a list of the failures from our run -->
-	<antcall target="excludeFromRunId" />
-
-	<!-- must invoke this with use_mustella_framework_dir=false to get a new mustella.swc built -->
-
-	<!-- make the classes into a jar -->
-	<jar basedir="${mustella.dir}/classes" destfile="${mustella.dir}/lib/mustella.jar" includes="mustella/*.class,utils/*.class"/>
-
-
-	<!-- write a properties file to be used by those running from jars and the mustella.swc and using an
-	     already fetched set of excludes
-	-->
-
-	<echo file="${mustella.dir}/${external_properties}" append="false">already_prepared=true</echo>
-	<propertyfile file="${mustella.dir}/${external_properties}" >
-		<entry key="excludes_done" value="true" />
-		<entry key="use_mustella_framework_dir" value="false" />
-		<entry key="current.run.id" value="-1" />
-	</propertyfile>
-
-
-	<!-- java stuff, properties, and the mustella swc -->
-        <fileset id="fwkstuff" dir="${mustella.dir}" >
-		<!-- include name="build.xml" / -->
-		<include name="lib/mustella.jar" />
-		<include name="properties/mustella1.properties" />
-		<include name="properties/mustella_tier1.properties" />
-	</fileset>
-
-
-	<antcall target="server_time" />
-	<copy verbose="true" file="${tmp.dir}/.server.time.vetting" tofile="${mustella.dir}/.server.time" />
-
-	<fileset id="testdiritself" dir="${mustella.dir}"  >
-		<include name="sdk/testsuites/mustella/**" />
-		<exclude name="**/*.log" />
-		<exclude name="sdk/testsuites/mustella/build/flex_sdk_?.zip" />
-		<exclude name="sdk/testsuites/mustella/flex_sdk_?.zip" />
-		<exclude name="sdk/testsuites/mustella/flex_sdk_locales.zip" />
-		<exclude name="sdk/testsuites/mustella/local.properties" />
-		<exclude name="sdk/testsuites/mustella/chart.license.properties" />
-		<exclude name="sdk/testsuites/mustella/build.properties" />
-		<exclude name="sdk/testsuites/mustella/aik.xml" />
-		<exclude name="sdk/testsuites/mustella/make_incr_zip.sh" />
-		<exclude name="**/*.swf" />
-		<exclude name="**/testpkg.zip" />
-		<exclude name="sdk/testsuites/mustella/build/**" />
-	</fileset>
-
-
-	<!-- actual location should be build number(directory) with packages in it   -->
-	<property file="${mustella.dir}/successfulBuild.properties" />
-	<echo>This is the build I'm acting on ${server}</echo>
-	<delete file="${mustella.dir}/${testpkg}" failonerror="false" quiet="false" />
-	<zip destfile="${mustella.dir}/${testpkg}" >
-		<fileset refid="fwkstuff" />
-		<fileset refid="testdiritself" />
-	</zip>
-	<!-- copy verbose="true" file="${mustella.dir}/successfulBuild.properties" todir="${tmp.dir}/flex" />
-    	<copy verbose="true" file="${mustella.dir}/${langZip}" todir="${tmp.dir}/flex/${server}" />
-	<copy verbose="true" file="${mustella.dir}/${mainZip}" todir="${tmp.dir}/flex/${server}" />
-	<copy verbose="true" file="${db_time_file}" todir="${tmp.dir}/flex/${server}" />
-	<copy verbose="true" file="${server_time_file}" todir="${tmp.dir}/flex/${server}" / -->
-
-
-	<delete file="${mustella.dir}/${external_properties}" />
-
+        <!-- assumption: we have a runid; we need it to get the failures relevant to the current build -->
+        <property file="${mustella.dir}/tests/runid.properties" />
+        <property name="current.run.id" value="${run_id}" />
+    
+        <echo>run id is ${current.run.id} </echo>
+    
+        <!-- we need a list of the failures from our run -->
+        <antcall target="excludeFromRunId" />
+    
+        <!-- must invoke this with use_mustella_framework_dir=false to get a new mustella.swc built -->
+    
+        <!-- make the classes into a jar -->
+        <jar basedir="${mustella.dir}/classes" destfile="${mustella.dir}/lib/mustella.jar" includes="mustella/*.class,utils/*.class"/>
+    
+    
+        <!-- write a properties file to be used by those running from jars and the mustella.swc and using an
+             already fetched set of excludes
+        -->
+    
+        <echo file="${mustella.dir}/${external_properties}" append="false">already_prepared=true</echo>
+        <propertyfile file="${mustella.dir}/${external_properties}" >
+            <entry key="excludes_done" value="true" />
+            <entry key="use_mustella_framework_dir" value="false" />
+            <entry key="current.run.id" value="-1" />
+        </propertyfile>
+        
+        <!-- java stuff, properties, and the mustella swc -->
+            <fileset id="fwkstuff" dir="${mustella.dir}" >
+            <!-- include name="build.xml" / -->
+            <include name="lib/mustella.jar" />
+            <include name="properties/mustella1.properties" />
+            <include name="properties/mustella_tier1.properties" />
+        </fileset>
+    
+        <antcall target="server_time" />
+        <copy verbose="true" file="${tmp.dir}/.server.time.vetting" tofile="${mustella.dir}/.server.time" />
+    
+        <fileset id="testdiritself" dir="${mustella.dir}"  >
+            <include name="sdk/testsuites/mustella/**" />
+            <exclude name="**/*.log" />
+            <exclude name="sdk/testsuites/mustella/build/flex_sdk_?.zip" />
+            <exclude name="sdk/testsuites/mustella/flex_sdk_?.zip" />
+            <exclude name="sdk/testsuites/mustella/flex_sdk_locales.zip" />
+            <exclude name="sdk/testsuites/mustella/local.properties" />
+            <exclude name="sdk/testsuites/mustella/chart.license.properties" />

[... 1945 lines stripped ...]


Mime
View raw message