flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - allow unittest.properties to override timeouts
Date Sun, 15 Jun 2014 05:14:14 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 8a56dadb2 -> c3b4b6356


allow unittest.properties to override timeouts


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c3b4b635
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c3b4b635
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c3b4b635

Branch: refs/heads/develop
Commit: c3b4b635658ca531d368f909291494e0cd2fa190
Parents: 8a56dad
Author: Alex Harui <aharui@apache.org>
Authored: Sat Jun 14 22:13:56 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat Jun 14 22:13:56 2014 -0700

----------------------------------------------------------------------
 compiler.jx.tests/.gitignore | 3 ++-
 compiler.jx.tests/build.xml  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3b4b635/compiler.jx.tests/.gitignore
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/.gitignore b/compiler.jx.tests/.gitignore
index 201ca55..a438218 100644
--- a/compiler.jx.tests/.gitignore
+++ b/compiler.jx.tests/.gitignore
@@ -2,4 +2,5 @@
 /classes
 /lib
 /results
-/temp
\ No newline at end of file
+/temp
+unittest.properties
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3b4b635/compiler.jx.tests/build.xml
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/build.xml b/compiler.jx.tests/build.xml
index c2c4475..bb8ba74 100644
--- a/compiler.jx.tests/build.xml
+++ b/compiler.jx.tests/build.xml
@@ -27,6 +27,8 @@
 
     <property environment="env"/>
 	<property file="unittest.properties" />
+	<property name="test.timeout" value="300000" />
+	<property name="maxmem" value="512" />
 	
 	<condition property="sdk" value="${FLEX_HOME}" else="${env.FLEX_HOME}">
 	    <isset property="FLEX_HOME" />
@@ -56,7 +58,7 @@
         <mkdir dir="${compiler.tests}/results"/>
         <mkdir dir="${compiler.tests}/temp"/>
         <junit dir="${compiler.tests}"
-               fork="yes" forkMode="perBatch" maxmemory="256m" timeout="300000"
+               fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
                printsummary="true" showoutput="true"
                haltonerror="false" haltonfailure="false"
                failureproperty="tests.unit.failed">


Mime
View raw message