Repository: flex-falcon Updated Branches: refs/heads/develop 916b2b2c8 -> 8a37541fe
don't run tests that require Flex SDK if SDK is not present Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8a37541f Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8a37541f Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8a37541f Branch: refs/heads/develop Commit: 8a37541fe0c6047388659192292ab4be5c1e0280 Parents: fa7f32a Author: Alex Harui <aha...@apache.org> Authored: Mon Jun 27 07:56:56 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Mon Jun 27 07:57:06 2016 -0700 ---------------------------------------------------------------------- compiler/src/test/build.xml | 20 +++++++++++++------- .../src/test/java/as/ASFeatureTestsBase.java | 3 ++- 2 files changed, 15 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8a37541f/compiler/src/test/build.xml ---------------------------------------------------------------------- diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml index 8698577..63c8be1 100644 --- a/compiler/src/test/build.xml +++ b/compiler/src/test/build.xml @@ -304,20 +304,23 @@ <batchtest todir="${compiler}/target/junit-reports"> <fileset dir="${compiler}/target/test-classes"> <include name="**/*Tests.class"/> + <exclude name="f/**"/> <exclude name="mxml/tags/**"/> <exclude name="properties/**"/> - <exclude name="**/MXMLDesignLayerNodeTests.class"/> - <exclude name="**/MXMLHTTPServiceNodeTests.class"/> - <exclude name="**/MXMLModelNodeTests.class"/> - <exclude name="**/MXMLRemoteObjectNodeTests.class"/> - <exclude name="**/MXMLStateNodeTests.class"/> - <exclude name="**/MXMLWebServiceNodeTests.class"/> <exclude name="**/MXMLComponentTagTests.class"/> <exclude name="**/MXMLHTTPServiceTagTests.class"/> <exclude name="**/MXMLModelTagTests.class"/> + <exclude name="**/MXMLRemoteObjectNodeTests.class"/> + <exclude name="**/MXMLWebServiceNodeTests.class"/> + <exclude name="**/MXMLProperty*.class"/> + <exclude name="**/MXMLDesignLayerNodeTests.class"/> + <exclude name="**/MXMLHTTPServiceNodeTests.class"/> + <exclude name="**/MXMLModelNodeTests.class"/> <exclude name="**/MXMLRemoteObjectTagTests.class"/> + <exclude name="**/MXMLStateNodeTests.class"/> + <exclude name="**/MXMLVectorNodeTests.class"/> <exclude name="**/MXMLWebServiceTagTests.class"/> - <exclude name="**/MXMLProperty*.class"/> + </fileset> </batchtest> <formatter type="xml"/> @@ -340,6 +343,7 @@ </classpath> <batchtest todir="${compiler}/target/junit-reports"> <fileset dir="${compiler}/target/test-classes"> + <include name="f/**"/> <include name="**/MXMLComponentTagTests.class"/> <include name="**/MXMLHTTPServiceTagTests.class"/> <include name="**/MXMLModelTagTests.class"/> @@ -352,7 +356,9 @@ <include name="**/MXMLModelNodeTests.class"/> <include name="**/MXMLRemoteObjectNodeTests.class"/> <include name="**/MXMLStateNodeTests.class"/> + <include name="**/MXMLVectorNodeTests.class"/> <include name="**/MXMLWebServiceNodeTests.class"/> + </fileset> </batchtest> <formatter type="xml"/> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8a37541f/compiler/src/test/java/as/ASFeatureTestsBase.java ---------------------------------------------------------------------- diff --git a/compiler/src/test/java/as/ASFeatureTestsBase.java b/compiler/src/test/java/as/ASFeatureTestsBase.java index 0ff167a..4accbec 100644 --- a/compiler/src/test/java/as/ASFeatureTestsBase.java +++ b/compiler/src/test/java/as/ASFeatureTestsBase.java @@ -99,7 +99,8 @@ public class ASFeatureTestsBase String libraryPath = "-library-path=" + StringUtils.join(swcs.toArray(new String[swcs.size()]), ","); args.add(libraryPath); } - args.add("-namespace=" + NAMESPACE_2009 + "," + testAdapter.getFlexManifestPath("mxml-2009")); + if (withFramework || withRPC || withSpark) + args.add("-namespace=" + NAMESPACE_2009 + "," + testAdapter.getFlexManifestPath("mxml-2009")); if (otherOptions != null) { Collections.addAll(args, otherOptions);
