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 2017/05/03 04:14:15 UTC
git commit: [flex-falcon] [refs/heads/develop] - fix test
Repository: flex-falcon
Updated Branches:
refs/heads/develop 37128e83d -> fae10ea14
fix test
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fae10ea1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fae10ea1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fae10ea1
Branch: refs/heads/develop
Commit: fae10ea142dc8b98db0cd9eea66d99ca65db3a4d
Parents: 37128e8
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 2 21:10:39 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 2 21:10:39 2017 -0700
----------------------------------------------------------------------
.../mxml/flexjs/TestFlexJSMXMLApplication.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fae10ea1/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
index ae28748..4f10311 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
@@ -825,18 +825,20 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase
public void testFlexJSMainFileDual()
{
MXMLJSC mxmlc = new MXMLJSC();
- String[] args = new String[8];
+ String[] args = new String[10];
args[0] = "-compiler.targets=SWF,JSFlex";
args[1] = "-compiler.allow-subclass-overrides";
args[2] = "-remove-circulars";
args[3] = "-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs")).getPath();
- args[4] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
- args[5] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/FlexJSTest_again.swf").getPath();
+ args[4] = "-js-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/js/FlexJS/libs")).getPath();
+ args[5] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
+ args[6] = "-js-external-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/js/libs/js.swc")).getPath();
+ args[7] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/FlexJSTest_again.swf").getPath();
if (env.GOOG != null)
- args[6] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
+ args[8] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
else
- args[6] = "-define=COMPILE::temp,false";
- args[7] = new File(testAdapter.getUnitTestBaseDir(), "flexjs/files/FlexJSTest_again.mxml").getPath();
+ args[8] = "-define=COMPILE::temp,false";
+ args[9] = new File(testAdapter.getUnitTestBaseDir(), "flexjs/files/FlexJSTest_again.mxml").getPath();
ArrayList<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
int result = mxmlc.mainNoExit(args, problems, true);