You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/06/14 19:56:56 UTC
[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 <ah...@apache.org>
Authored: Sat Jun 14 10:56:26 2014 -0700
Committer: Alex Harui <ah...@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">
[2/2] git commit: [flex-falcon] [refs/heads/develop] - for some
reason that compiled in Eclipse but not in Ant
Posted by ah...@apache.org.
for some reason that compiled in Eclipse but not in Ant
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8a56dadb
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8a56dadb
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8a56dadb
Branch: refs/heads/develop
Commit: 8a56dadb2ab2712c5f30304b9f6cc4f28056614f
Parents: fd54072
Author: Alex Harui <ah...@apache.org>
Authored: Sat Jun 14 10:56:48 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Jun 14 10:56:48 2014 -0700
----------------------------------------------------------------------
.../UnsupportedLanguageFeatureProblem.java | 33 +++++++++++---------
1 file changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8a56dadb/compiler.jx/src/org/apache/flex/compiler/problems/UnsupportedLanguageFeatureProblem.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/problems/UnsupportedLanguageFeatureProblem.java b/compiler.jx/src/org/apache/flex/compiler/problems/UnsupportedLanguageFeatureProblem.java
index a6da3e5..fbd55cd 100644
--- a/compiler.jx/src/org/apache/flex/compiler/problems/UnsupportedLanguageFeatureProblem.java
+++ b/compiler.jx/src/org/apache/flex/compiler/problems/UnsupportedLanguageFeatureProblem.java
@@ -1,7 +1,23 @@
-package org.apache.flex.compiler.problems;
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+ package org.apache.flex.compiler.problems;
import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.internal.parsing.as.ASToken;
import org.apache.flex.compiler.problems.annotations.ProblemClassification;
@ProblemClassification(CompilerProblemClassification.SYNTAX_ERROR)
@@ -16,17 +32,6 @@ public class UnsupportedLanguageFeatureProblem extends CodegenProblem
super(site);
tokenText = text;
}
-
- public UnsupportedLanguageFeatureProblem(ASToken site, String text)
- {
- super(site);
- tokenText = text;
- }
-
- public UnsupportedLanguageFeatureProblem(ASToken token)
- {
- this(token, token.getText());
- }
-
+
public final String tokenText;
}