Revert "run extern tests separately" This reverts commit e7acbce88f3f26b34b2d79bc2ef79bfde579bce4.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/618b3aeb Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/618b3aeb Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/618b3aeb Branch: refs/heads/develop Commit: 618b3aebff796a0ff666b2745ceb0647d49e694d Parents: dd64f05 Author: Alex Harui <[email protected]> Authored: Tue May 24 16:28:34 2016 -0700 Committer: Alex Harui <[email protected]> Committed: Tue May 24 16:28:34 2016 -0700 ---------------------------------------------------------------------- build.xml | 9 ++------- compiler-jx/src/test/build.xml | 21 ++------------------- 2 files changed, 4 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/618b3aeb/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 41ab8bc..1eae4f3 100644 --- a/build.xml +++ b/build.xml @@ -70,11 +70,9 @@ <target name="main" depends="sdk, javadoc, tests" description="Default target - Builds a Falcon SDK, builds Falcon Javadoc, and runs tests."/> - <target name="all" depends="main, jx, externs, oem, debugger" description="Builds Falcon, then FalconJX"/> + <target name="all" depends="main, jx, oem, debugger" description="Builds Falcon, then FalconJX"/> - <target name="jx" depends="compiler.jx, compiler.jx.tests" description="Builds FalconJX" /> - - <target name="externs" depends="extern.swcs, extern.tests" description="Build externs and run tests"/> + <target name="jx" depends="compiler.jx, extern.swcs, compiler.jx.tests" description="Builds FalconJX" /> <target name="oem" depends="compiler.oem" description="Builds FB Integration JAR" /> @@ -111,9 +109,6 @@ <target name="extern.swcs.wipe" > <ant dir="externs" target="wipe"/> </target> - <target name="extern.tests"> - <ant dir="compiler-jx/src/test" target="extern.tests" /> - </target> <target name="clean" description="Cleans the build output but leaves any downloaded JARs."> <ant dir="compiler" target="clean"/> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/618b3aeb/compiler-jx/src/test/build.xml ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml index 0797b51..536786c 100644 --- a/compiler-jx/src/test/build.xml +++ b/compiler-jx/src/test/build.xml @@ -71,15 +71,6 @@ <exclude name="**/TestFlexJSFile.class"/> <exclude name="**/TestFlexJSMXML*.class"/> <exclude name="**/TestMXML*.class"/> - <!-- externs tests --> - <exclude name="**/TestExtern*.class"/> - <exclude name="**/TestAnnotationEnum.class"/> - <exclude name="**/TestCollectImports.class"/> - <exclude name="**/TestConstructor.class"/> - <exclude name="**/TestPackageNamespace.class"/> - <exclude name="**/TestReferenceModel.class"/> - <exclude name="**/TestTypeExternals.class"/> - <exclude name="**/TestTypeInheritance.class"/> </fileset> </batchtest> <formatter type="xml"/> @@ -132,7 +123,7 @@ </junit> </target> - <target name="extern.tests" depends="download, compile.unit.tests"> + <target name="js.swc" depends="download, compile.unit.tests"> <mkdir dir="${compiler.tests}/results"/> <mkdir dir="${compiler}/target/junit-temp"/> <junit dir="${compiler.tests}" @@ -147,15 +138,7 @@ </classpath> <batchtest todir="${compiler}/target/junit-results"> <fileset dir="${compiler}/target/test-classes"> - <!-- externs tests --> - <include name="**/TestExtern*.class"/> - <include name="**/TestAnnotationEnum.class"/> - <include name="**/TestCollectImports.class"/> - <include name="**/TestConstructor.class"/> - <include name="**/TestPackageNamespace.class"/> - <include name="**/TestReferenceModel.class"/> - <include name="**/TestTypeExternals.class"/> - <include name="**/TestTypeInheritance.class"/> + <include name="**/TestExternalsJSCompile.class"/> </fileset> </batchtest> <formatter type="xml"/>
