This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 6830ee55299dc18cbf2b88f44f468aced180f30f Author: Erik de Bruin <[email protected]> AuthorDate: Wed Nov 15 11:12:11 2017 +0100 Fix build scripts; ignore WASTC test Signed-off-by: Erik de Bruin <[email protected]> --- compiler-jx/.classpath | 12 ++++++------ compiler-jx/build.xml | 11 +++++++++++ .../royale/compiler/internal/codegen/wast/TestWASTClass.java | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath index e730144..2bc1f74 100644 --- a/compiler-jx/.classpath +++ b/compiler-jx/.classpath @@ -6,12 +6,12 @@ <classpathentry kind="src" path="src/main/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/compiler"/> - <classpathentry kind="lib" path="lib/google/closure-compiler/compiler.jar"/> - <classpathentry kind="lib" path="lib/commons-io.jar"/> - <classpathentry kind="lib" path="lib/args4j.jar"/> - <classpathentry kind="lib" path="lib/guava.jar"/> - <classpathentry kind="lib" path="lib/flex-tool-api.jar"/> - <classpathentry kind="lib" path="lib/junit-4.10.jar"/> + <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/google/closure-compiler/compiler.jar"/> + <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/commons-io.jar"/> + <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/args4j.jar"/> + <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/guava.jar"/> + <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/flex-tool-api.jar"/> + <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/junit-4.10.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Commons Compress"/> <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler/lib/external/commons-lang-2.6.jar"/> <classpathentry kind="output" path="target/classes"/> diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml index 793bf02..a031506 100644 --- a/compiler-jx/build.xml +++ b/compiler-jx/build.xml @@ -97,6 +97,11 @@ <mkdir dir="${classes.dir}/META-INF" /> <mkdir dir="${lib}/google/closure-compiler" /> <ant antfile="${basedir}/src/main/resources/downloads.xml" dir="${basedir}/src/main/resources" inheritAll="false"/> + <ant dir="../compiler-test-utils"> + <target name="clean" /> + <target name="main" /> + </ant> + <copy file="${basedir}/../compiler-test-utils/target/classes/org/apache/royale/utils/EnvProperties.class" tofile="${classes.dir}/org/apache/royale/utils/EnvProperties.class"/> </target> <target name="main" depends="prebuild,compile"> @@ -107,6 +112,11 @@ <copy file="${basedir}/../NOTICE" tofile="${classes.dir}/META-INF/NOTICE"/> <echo message="Building ${wastc.jar}" /> + <ant dir="../compiler-test-utils"> + <target name="clean" /> + <target name="main" /> + </ant> + <copy file="${basedir}/../compiler-test-utils/target/classes/org/apache/royale/utils/EnvProperties.class" tofile="${classes.dir}/org/apache/royale/utils/EnvProperties.class"/> <jar file="${wastc.jar}" basedir="${classes.dir}" includes="**/*.properties,org/apache/**/*,META-INF/**/*" excludes="" > @@ -223,6 +233,7 @@ <include name="mxmlc.jar" /> <include name="jsc.jar" /> <include name="asdoc.jar" /> + <include name="wastc.jar" /> </fileset> </delete> </target> diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java index eab8957..bf178e6 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java @@ -21,6 +21,7 @@ package org.apache.royale.compiler.internal.codegen.wast; import org.apache.royale.compiler.internal.test.WASTTestBase; import org.apache.royale.compiler.tree.as.IClassNode; +import org.junit.Ignore; import org.junit.Test; /** @@ -30,6 +31,7 @@ import org.junit.Test; */ public class TestWASTClass extends WASTTestBase { + @Ignore @Test public void testClassSimple() { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
