incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1371753 - in /incubator/flex/trunk/mustella: ./ build.xml local-template.properties local.properties properties/mustella_tmp.properties
Date Fri, 10 Aug 2012 16:04:15 GMT
Author: cframpton
Date: Fri Aug 10 16:04:14 2012
New Revision: 1371753

URL: http://svn.apache.org/viewvc?rev=1371753&view=rev
Log:
- Remove  properties/mustella_tmp.properties since it is a temp file which shouldn't be in
the repository.
- Remove local.properties.  If you need local.properties you should copy local-template.properties
to local.properties and edit it but you should not need it if you have the usual air and player
environment variables set up and you want to run the tests using the player.  If you want
to run the tests using air either set use_apollo=true in local.properties or invoke mini_run.sh
-addAntArg=-Duse_apollo=true.
- Ignore the results.txt and failures.txt files.
- If you want to clean the results of the mustella run you can invoke ant clean in the mustella
directory.  mini_run.sh does this before every run.

Removed:
    incubator/flex/trunk/mustella/local.properties
    incubator/flex/trunk/mustella/properties/mustella_tmp.properties
Modified:
    incubator/flex/trunk/mustella/   (props changed)
    incubator/flex/trunk/mustella/build.xml
    incubator/flex/trunk/mustella/local-template.properties

Propchange: incubator/flex/trunk/mustella/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 10 16:04:14 2012
@@ -2,3 +2,5 @@ mustella.swc
 *.class
 classes
 tmp
+failures.txt
+results.txt

Modified: incubator/flex/trunk/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/mustella/build.xml?rev=1371753&r1=1371752&r2=1371753&view=diff
==============================================================================
--- incubator/flex/trunk/mustella/build.xml (original)
+++ incubator/flex/trunk/mustella/build.xml Fri Aug 10 16:04:14 2012
@@ -834,12 +834,21 @@
             includes="${sdk.mustella.includes}"
             excludes="${sdk.mustella.excludes},${other.mustella.excludes}" />
 
-	<target name="clean" description="--> cleanup old report and actual files">
+	<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"/>
+            </fileset>
+            <fileset dir="${mustella.dir}">
+                <include name="test_files.tmp"/>
+                <include name="results.txt"/>
+            </fileset>
+        </delete>
     </target>
 
     <condition property="copy_adt_jar" value="true" >
@@ -1683,7 +1692,7 @@ we could have pmd_doler do the dir split
     <target name="dedicatedRun" depends="prepare,setup,getRunId,getExcludes,populateExcludeTable,unzipSwfs,justrun"
>
     </target>
 
-    <target name="run" depends="clean,prepare,setup,cleanswfs,compileswfs,getRunId,getExcludes,populateExcludeTable,justrun"
description="-->run tests">
+    <target name="run" depends="clean,prepare,setup,compileswfs,getRunId,getExcludes,populateExcludeTable,justrun"
description="-->run tests">
     </target>
 
     <property name="tmp_exclude_script" value="exclude_tmp.sh" />

Modified: incubator/flex/trunk/mustella/local-template.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/mustella/local-template.properties?rev=1371753&r1=1371752&r2=1371753&view=diff
==============================================================================
--- incubator/flex/trunk/mustella/local-template.properties (original)
+++ incubator/flex/trunk/mustella/local-template.properties Fri Aug 10 16:04:14 2012
@@ -18,7 +18,15 @@
 ################################################################################
 ################################################################################
 # Notes: 
-#  - The default SDK location is flex/qa/sdk/testsuites/mustella/build.
+#  - Rename this file to local.properties and then set the relevant properties.
+#    Alternatively you can invoke ./mini_sh.sh with -addAntArg=-Dprop=value
+#
+#  - The default SDK location is the parent directory of the mustella subdirectory.
+#
+#  - If you have your AIR_HOME, PLAYERGLOBAL_HOME and FLASHPLAYER_DEBUGGER
+#    environment variables set either in your environment or in ../env.properties you
+#    do not need to set any of these properties for the standard player test run.
+#
 #  - Some properties are rarely needed, so they have been left out.  e.g.
 #        apollo_transform
 #        apollo_transform_prefix
@@ -64,8 +72,8 @@
 ################################################################################
 
 #------------------------------------------------------------------------------
-# This is the Flash Player's directory.  It is needed if the player is not in 
-# the default location relative to the Flex SDK.
+# This is the Flash Player's directory.
+# It is needed if the environment variable FLASHPLAYER_DEBUGGER is not set.
 #------------------------------------------------------------------------------
 # player.dir=${sdk.dir}/runtimes/player/10.2/mac/Flash Player Debugger.app/Contents/MacOS/
 
@@ -99,6 +107,7 @@ browser=/Applications/Firefox.app/Conten
 
 #------------------------------------------------------------------------------
 # This is used to find adl, which is the desktop AIR runtime.  
+# It is needed if the environment variable AIR_HOME is not set.
 #------------------------------------------------------------------------------
 # apollo_location=${sdk.dir}
 
@@ -214,13 +223,13 @@ browser=/Applications/Firefox.app/Conten
 #------------------------------------------------------------------------------
 # This is the account used for ftp.
 #------------------------------------------------------------------------------
-realUser=
+#realUser=
 
 #------------------------------------------------------------------------------
 # This is the sdkbuild account's password.  It is not listed because it changes
 # every 90 days.
 #------------------------------------------------------------------------------
-realPwd=
+#realPwd=
 
 #------------------------------------------------------------------------------
 # On iOS, this is how many threads to use for packaging.  Defaults to 1.



Mime
View raw message