Return-Path: 
 <commits-return-12323-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D132011C74
	for <apmail-flex-commits-archive@www.apache.org>;
 Sat, 14 Jun 2014 17:56:56 +0000 (UTC)
Received: (qmail 42798 invoked by uid 500); 14 Jun 2014 17:56:56 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 42677 invoked by uid 500); 14 Jun 2014 17:56:56 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 42665 invoked by uid 99); 14 Jun 2014 17:56:56 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2014 17:56:56 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 5114A934D64; Sat, 14 Jun 2014 17:56:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aharui@apache.org
To: commits@flex.apache.org
Date: Sat, 14 Jun 2014 17:56:56 -0000
Message-Id: <c77ac4eb920f46d192f0f8097274ebbb@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] git commit: [flex-falcon] [refs/heads/develop] - allow
 different timeout values for different machines

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 40020689c -> 8a56dadb2


allow different timeout values for different machines


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

Branch: refs/heads/develop
Commit: fd54072defd436b11e8fb0b8ee16dd41b5c764cd
Parents: 4002068
Author: Alex Harui <aharui@apache.org>
Authored: Sat Jun 14 10:56:26 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat Jun 14 10:56:26 2014 -0700

----------------------------------------------------------------------
 compiler.tests/build.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fd54072d/compiler.tests/build.xml
----------------------------------------------------------------------
diff --git a/compiler.tests/build.xml b/compiler.tests/build.xml
index b4ca61a..6801404 100644
--- a/compiler.tests/build.xml
+++ b/compiler.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" />
@@ -92,7 +94,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">
@@ -130,7 +132,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">
@@ -168,7 +170,7 @@
         <mkdir dir="${compiler.tests}/results"/>
         <mkdir dir="${compiler.tests}/temp"/>
         <junit dir="${compiler.tests}"
-               fork="yes" forkMode="perBatch" maxmemory="512m" timeout="300000"
+               fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
                printsummary="true" showoutput="true"
                haltonerror="false" haltonfailure="false"
                failureproperty="tests.functional.failed">