Repository: flex-sdk Updated Branches: refs/heads/develop 080f5e64d -> 55751650d
Revert "Fix for FLEX-34323." This reverts commit 8d030e70396d3f57ce5f5bf4aa2255f093982604. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/55751650 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/55751650 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/55751650 Branch: refs/heads/develop Commit: 55751650d4de2c99fc32f4ab4669a0c67e480410 Parents: 080f5e6 Author: dloverin <[email protected]> Authored: Tue May 20 10:56:13 2014 -0400 Committer: dloverin <[email protected]> Committed: Tue May 20 10:56:13 2014 -0400 ---------------------------------------------------------------------- mustella/README | 4 - .../as3/src/mustella/ExcludeFileLocation.as | 118 ++++++++--------- .../src/mustella/ExcludeFileLocationApollo.as | 131 ++++++++----------- mustella/as3/src/mustella/UnitTester.as | 17 +-- mustella/build.xml | 55 ++++---- .../java/src/mustella/CompileMustellaSwfs.java | 25 ++-- mustella/mini_run.sh | 10 +- 7 files changed, 148 insertions(+), 212 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55751650/mustella/README ---------------------------------------------------------------------- diff --git a/mustella/README b/mustella/README index 14fd207..39f0509 100644 --- a/mustella/README +++ b/mustella/README @@ -60,7 +60,3 @@ Basic Commands ./mini_run.sh -caseName=datagrid_properties_columns_0 tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_columns.mxml This command runs a specific test case from a specific test file. - -Alternate Location of Test Files -================================ - You can create Mustella tests for your own components and put them in your own test directory outside of the Flex SDK and Mustella source directories. To do this set the MUSTELLA_TEST_DIR environment variable to the absolute path of the directory containing your tests. Your test directory will need to include the exclude files (ExcludeList*.txt) for the platforms you are testing on but the files may be empty if you have no tests to exclude. After setting MUSTELLA_TEST_DIR, mini_run.sh will look in the new directory for tests to run instead of the 'tests' subdirectory of mustella. http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55751650/mustella/as3/src/mustella/ExcludeFileLocation.as ---------------------------------------------------------------------- diff --git a/mustella/as3/src/mustella/ExcludeFileLocation.as b/mustella/as3/src/mustella/ExcludeFileLocation.as index 7fec85c..268cfef 100644 --- a/mustella/as3/src/mustella/ExcludeFileLocation.as +++ b/mustella/as3/src/mustella/ExcludeFileLocation.as @@ -19,9 +19,9 @@ package { import flash.display.DisplayObject; -import flash.events.Event; import flash.net.URLLoader; import flash.net.URLRequest; +import flash.events.Event; import flash.system.Capabilities; [Mixin] @@ -40,7 +40,7 @@ public class ExcludeFileLocation private static var loader:URLLoader; public static var url:String; - public static var mustellaTestDir:String; + public static var mustellaDir:String; public static var frontURL:String; public static var domain:String; @@ -65,60 +65,51 @@ public class ExcludeFileLocation trace ("Hello from excludes at: " + new Date()); - // set up callback to load excludes after - // UnitTester has initialized. - UnitTester.loadExcludeFile = loadExcludeFile; - - } - - public static function loadExcludeFile(root:DisplayObject):void - { - var os:String = Capabilities.os; - - - if (os.indexOf ("Windows") != -1) - { - excludeFile = "ExcludeListWin.txt"; - } else if (os.indexOf ("Mac") != -1) - { - excludeFile = "ExcludeListMac.txt"; - } else if (os.indexOf ("Linux") != -1) - { - excludeFile = "ExcludeListLinux.txt"; - } else - { - trace ("Excludes: bad: we didn't see an OS we liked: " + os); - excludeFile = "ExcludeListWin.txt"; - } - - - _root = root; - - url = root.loaderInfo.url; - - // allow application to override mustella test dir - if (!UnitTester.mustellaTestDir) - mustellaTestDir = url.substring (0, url.indexOf ("mustella/tests")+14); - else - mustellaTestDir = UnitTester.mustellaTestDir; - - frontURL = url.substring (0, url.indexOf (":")); - - domain = url.substring (url.indexOf (":")+3); - domain = domain.substring (0, domain.indexOf ("/")); - - if (Capabilities.playerType == "PlugIn" || Capabilities.playerType == "ActiveX") - { - loadTryBrowser(); - } else - { - loadTryNormal(); - - } - - } - - public static function loadTryBrowser():void + + var os:String = Capabilities.os; + + + if (os.indexOf ("Windows") != -1) + { + excludeFile = "ExcludeListWin.txt"; + } else if (os.indexOf ("Mac") != -1) + { + excludeFile = "ExcludeListMac.txt"; + } else if (os.indexOf ("Linux") != -1) + { + excludeFile = "ExcludeListLinux.txt"; + } else + { + trace ("Excludes: bad: we didn't see an OS we liked: " + os); + excludeFile = "ExcludeListWin.txt"; + } + + + _root = root; + + url = root.loaderInfo.url; + + mustellaDir = url.substring (0, url.indexOf ("mustella/tests")+14); + + frontURL = url.substring (0, url.indexOf (":")); + + domain = url.substring (url.indexOf (":")+3); + domain = domain.substring (0, domain.indexOf ("/")); + + if (Capabilities.playerType == "PlugIn" || Capabilities.playerType == "ActiveX") + { + loadTryBrowser(); + } else + { + loadTryNormal(); + + } + + } + + + + public static function loadTryBrowser():void { trace ("excludes loadTryBrowser at: " + new Date().toString()); @@ -157,9 +148,10 @@ public class ExcludeFileLocation { trace ("Exclude: in the web read error handler"); - if (!triedNormal) + if (!triedNormal) { - loadTryNormal(); + loadTryNormal(); + } } @@ -174,11 +166,11 @@ public class ExcludeFileLocation var useFile:String; - useFile = mustellaTestDir +"/" + excludeFile; + useFile = mustellaDir +"/" + excludeFile; trace ("Exclude: try load from: " + useFile); - var req:URLRequest = new URLRequest(useFile); + var req:URLRequest = new URLRequest(useFile); loader = new URLLoader(); loader.addEventListener("complete", completeHandler2); loader.addEventListener("ioError", errorHandler2); @@ -189,8 +181,8 @@ public class ExcludeFileLocation private static function errorHandler2(event:Event):void { - trace ("Exclude: error in the exclude file load " +event); - if (!triedBrowser) + trace ("Exclude: error in the exclude file load " +event); + if (!triedBrowser) { loadTryBrowser(); } @@ -200,7 +192,7 @@ public class ExcludeFileLocation private static function completeHandler2(event:Event):void { - trace ("Excludes: Reading from file system at "+mustellaTestDir ); + trace ("Excludes: Reading from file system at "+mustellaDir ); postProcessData(event); } private static function postProcessData(event:Event):void http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55751650/mustella/as3/src/mustella/ExcludeFileLocationApollo.as ---------------------------------------------------------------------- diff --git a/mustella/as3/src/mustella/ExcludeFileLocationApollo.as b/mustella/as3/src/mustella/ExcludeFileLocationApollo.as index d9529d9..73f730e 100644 --- a/mustella/as3/src/mustella/ExcludeFileLocationApollo.as +++ b/mustella/as3/src/mustella/ExcludeFileLocationApollo.as @@ -41,7 +41,7 @@ public class ExcludeFileLocationApollo private static var loader:URLLoader; private static var url:String; - private static var mustellaTestDir:String; + private static var mustellaDir:String; private static var frontURL:String; private static var domain:String; @@ -66,79 +66,64 @@ public class ExcludeFileLocationApollo trace ("Hello from excludes at: " + new Date()); - // set up callback to load excludes after - // UnitTester has initialized. - UnitTester.loadExcludeFile = loadExcludeFile; - - } + var os:String = Capabilities.os; + // This seems to be a timing issue which pops up on some machines. + if( UnitTester.cv == null ){ + UnitTester.cv = new ConditionalValue(); + } - public static function loadExcludeFile(root:DisplayObject):void - { - var os:String = Capabilities.os; - - // This seems to be a timing issue which pops up on some machines. - if( UnitTester.cv == null ){ - UnitTester.cv = new ConditionalValue(); - } - - if( (UnitTester.cv.os != null) && (UnitTester.cv.os.toLowerCase() == DeviceNames.ANDROID.toLowerCase()) ){ - mustellaTestDir = ".."; - excludeFile = UnitTester.excludeFile; - trace("Doing Android style exclude. Checking in " + mustellaTestDir + "/" + excludeFile); - }else if( (UnitTester.cv.os != null) && (UnitTester.cv.os.toLowerCase() == DeviceNames.IOS.toLowerCase()) ){ - mustellaTestDir = File.documentsDirectory.url; - excludeFile = UnitTester.excludeFile; - }else if (os.indexOf ("QNX") > -1) { - mustellaTestDir = ".."; - excludeFile = UnitTester.excludeFile; - trace("Doing QNX style exclude. Checking in " + mustellaTestDir + "/" + excludeFile); - } - else{ - - if (os.indexOf ("Windows") != -1) - { - excludeFile = "ExcludeListWinAIR.txt"; - } else if (os.indexOf ("Mac") != -1) - { - excludeFile = "ExcludeListMacAIR.txt"; - } else if (os.indexOf ("Linux") != -1) - { - excludeFile = "ExcludeListLinux.txt"; - } else - { - trace ("Excludes: bad: we didn't see an OS we liked: " + os); - excludeFile = "ExcludeListWin.txt"; - } - - _root = root; - - url = root.loaderInfo.url; - - if (url.indexOf("app:")!=-1) - { - ApolloFilePath.init (root); - url = encodeURI2(ApolloFilePath.apolloAdjust(url)); - trace ("Adjusting path for AIR to: " + url); - // url = adjustPath(url); - } - - // allow application to override mustella test dir - if (!UnitTester.mustellaTestDir) - mustellaTestDir = url.substring (0, url.indexOf ("mustella/tests")+14); - else - mustellaTestDir = UnitTester.mustellaTestDir; - - frontURL = url.substring (0, url.indexOf (":")); - domain = url.substring (url.indexOf (":")+3); - domain = domain.substring (0, domain.indexOf ("/")); - } - - loadTryNormal(); - - } + if( (UnitTester.cv.os != null) && (UnitTester.cv.os.toLowerCase() == DeviceNames.ANDROID.toLowerCase()) ){ + mustellaDir = ".."; + excludeFile = UnitTester.excludeFile; + trace("Doing Android style exclude. Checking in " + mustellaDir + "/" + excludeFile); + }else if( (UnitTester.cv.os != null) && (UnitTester.cv.os.toLowerCase() == DeviceNames.IOS.toLowerCase()) ){ + mustellaDir = File.documentsDirectory.url; + excludeFile = UnitTester.excludeFile; + }else if (os.indexOf ("QNX") > -1) { + mustellaDir = ".."; + excludeFile = UnitTester.excludeFile; + trace("Doing QNX style exclude. Checking in " + mustellaDir + "/" + excludeFile); + } + else{ + + if (os.indexOf ("Windows") != -1) + { + excludeFile = "ExcludeListWinAIR.txt"; + } else if (os.indexOf ("Mac") != -1) + { + excludeFile = "ExcludeListMacAIR.txt"; + } else if (os.indexOf ("Linux") != -1) + { + excludeFile = "ExcludeListLinux.txt"; + } else + { + trace ("Excludes: bad: we didn't see an OS we liked: " + os); + excludeFile = "ExcludeListWin.txt"; + } + + _root = root; + + url = root.loaderInfo.url; + + if (url.indexOf("app:")!=-1) + { + ApolloFilePath.init (root); + url = encodeURI2(ApolloFilePath.apolloAdjust(url)); + trace ("Adjusting path for AIR to: " + url); + // url = adjustPath(url); + } + + mustellaDir = url.substring (0, url.indexOf ("mustella/tests")+14); + frontURL = url.substring (0, url.indexOf (":")); + domain = url.substring (url.indexOf (":")+3); + domain = domain.substring (0, domain.indexOf ("/")); + } + + loadTryNormal(); + } - private static function apolloAdjust(url:String):String + private static function apolloAdjust(url:String):String { var swf:String = _root.loaderInfo.url; @@ -242,7 +227,7 @@ public class ExcludeFileLocationApollo var useFile:String; - useFile = mustellaTestDir +"/" + excludeFile; + useFile = mustellaDir +"/" + excludeFile; trace ("Exclude: try load from: " + useFile); @@ -268,7 +253,7 @@ public class ExcludeFileLocationApollo private static function completeHandler2(event:Event):void { - trace ("Excludes: Reading from file system at "+mustellaTestDir ); + trace ("Excludes: Reading from file system at "+mustellaDir ); postProcessData(event); } private static function postProcessData(event:Event):void http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55751650/mustella/as3/src/mustella/UnitTester.as ---------------------------------------------------------------------- diff --git a/mustella/as3/src/mustella/UnitTester.as b/mustella/as3/src/mustella/UnitTester.as index 9aedc71..a558b58 100644 --- a/mustella/as3/src/mustella/UnitTester.as +++ b/mustella/as3/src/mustella/UnitTester.as @@ -95,18 +95,6 @@ public class UnitTester extends EventDispatcher **/ public static var excludeFile:String = ""; - /** - * The location of the mustella test directory. - */ - public static var mustellaTestDir:String = ""; - - /** - * Set by either ExcludeFileLocation or ExcludeFileLocationApollo so they - * can be called back to load the exclude file after mustellaTestDir has - * been set in the init() method. - */ - public static var loadExcludeFile:Function; - /** * This is a placeholder. We don't do portrait and landscape runs right now * and probablay won't. Delete. @@ -165,9 +153,6 @@ public class UnitTester extends EventDispatcher public static function init(root:DisplayObject):void { - if (loadExcludeFile != null) - loadExcludeFile(root); - // don't let child swfs override this if (!_root) _root = root; @@ -366,7 +351,7 @@ public class UnitTester extends EventDispatcher var q:QName = new QName(mx_internal, "hideCursor"); g[q] = true; } - } + } } /** http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55751650/mustella/build.xml ---------------------------------------------------------------------- diff --git a/mustella/build.xml b/mustella/build.xml index 12c5e0a..6183026 100644 --- a/mustella/build.xml +++ b/mustella/build.xml @@ -22,15 +22,12 @@ <!-- Load the local properties. Need sdk.dir to load the Flex config env vars. --> <property name="local_properties" value="local.properties" /> <property file="${basedir}/${local_properties}" /> - <property environment="env"/> - - <condition property="sdk.dir" value="${env.FLEX_HOME}" else="${basedir}/.."> - <isset property="env.FLEX_HOME"/> - </condition> - + <property name="sdk.dir" value="${basedir}/.." /> + <property file="${sdk.dir}/env.properties"/> + <property environment="env"/> - <pathconvert property="mustella.dir" dirsep="/" > + <pathconvert property="mustella.dir" dirsep="/" > <path location="${basedir}" /> </pathconvert> @@ -67,10 +64,7 @@ <property name="apollo_transform_template" value="${mustella.dir}/Assets/AirTransform/WindowedAppTemplate.mxml" /> <property name="previous.generated.testfiles" value="**/*.swf,**/*.output,**/SWFs/${apollo_transform_prefix}*.mxml,**/swfs/${apollo_transform_prefix}*.mxml,**/SWFs/${apollo_transform_prefix2}*.mxml,**/swfs/${apollo_transform_prefix2}*.mxml" /> - <condition property="sdk.mustella.dir" value="${env.MUSTELLA_TEST_DIR}" else="${mustella.dir}/tests"> - <isset property="env.MUSTELLA_TEST_DIR"/> - </condition> - + <property name="sdk.mustella.dir" value="${mustella.dir}/tests" /> <!-- This directory doesn't exist in the source kit so make it although it would be better to make sure no targets that the source kit uses expect this directory to exist. @@ -101,9 +95,7 @@ <property name="strict" value="true" /> <property name="exit_on_compile_error" value="" /> - <available file="/cygwin/bin/sh.exe" property="cygwinshell" value="/cygwin/bin/sh.exe"/> - <available file="/cygwin64/bin/sh.exe" property="cygwinshell" value="/cygwin64/bin/sh.exe"/> - + <property name="cygwinshell" value="/cygwin/bin/sh.exe" /> <property name="buildURL" value="true" /> <property name="classes.dir" value="${mustella.dir}/classes" /> @@ -177,7 +169,7 @@ <!-- Mobile stuff will be changed by handle_mobile_config later if it's a mobile run. --> <property name="target_os_name" value="${host_os_name}" /> - <condition property="exclude_filename" value="${sdk.mustella.dir}/ExcludeListWin.txt" > + <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListWin.txt" > <and> <equals arg1="${target_os_name}" arg2="windows" /> <not> @@ -186,7 +178,7 @@ </and> </condition> - <condition property="exclude_filename" value="${sdk.mustella.dir}/ExcludeListMac.txt" > + <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListMac.txt" > <and> <equals arg1="${target_os_name}" arg2="mac" /> <not> @@ -195,21 +187,21 @@ </and> </condition> - <condition property="exclude_filename" value="${sdk.mustella.dir}/ExcludeListMacAIR.txt" > + <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListMacAIR.txt" > <and> <equals arg1="${target_os_name}" arg2="mac" /> <istrue value="${use_apollo}" /> </and> </condition> - <condition property="exclude_filename" value="${sdk.mustella.dir}/ExcludeListWinAIR.txt" > + <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListWinAIR.txt" > <and> <equals arg1="${target_os_name}" arg2="windows" /> <istrue value="${use_apollo}" /> </and> </condition> - <condition property="exclude_filename" value="${sdk.mustella.dir}/ExcludeListLinux.txt" > + <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListLinux.txt" > <equals arg1="${target_os_name}" arg2="Linux" /> </condition> @@ -665,11 +657,10 @@ <path path="${tmp.sdk.mustella.scripts2}" /> </pathconvert> <exec executable="${shell}" failonerror="${exit_on_compile_error}"> - <arg value="${mustella.dir}/scripts/shellrunner.sh" /> + <arg value="${sdk.mustella.dir}/../scripts/shellrunner.sh" /> <env key="MUSTELLA_SCRIPTS2" value="${sdk.mustella.scripts2}" /> <env key="SDK_DIR" value="${sdk.dir}" /> <env key="MUSTELLA_DIR" value="${mustella.dir}" /> - <env key="MUSTELLA_TEST_DIR" value="${sdk.mustella.dir}" /> <env key="USE_APOLLO" value="${use_apollo}" /> <env key="APOLLO_TRANSFORM" value="${apollo_transform}" /> </exec> @@ -706,7 +697,7 @@ <taskdef name="getrunidtask" classname="mustella.GetRunIdTask" classpathref="flex.test.classpath"/> <getrunidtask host="host" property="current.run.id" build="${build.id}" branch="${branch_name}" type="${run_type}" browserName="${browser_name}" config="${config_id}" swf="${version_fetcher}" player="${player}" time="${db_time}" os="${os}" osVersion="${os_version}" arch="${arch}"/> <echo message="yo yo yo new id: ${current.run.id}" /> - <echo file="${sdk.mustella.dir}/runid.properties" append="false">run_id=${current.run.id}</echo> + <echo file="${mustella.dir}/tests/runid.properties" append="false">run_id=${current.run.id}</echo> <!-- read the file, make sure we match --> @@ -738,7 +729,7 @@ </condition> <target name="handle_mobile_config" depends="get_mobile_data,device_fail" if="do_handle_mobile_config" > - <condition property="exclude_filename" value="${sdk.mustella.dir}/ExcludeList${os}.txt" > + <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeList${os}.txt" > <equals arg1="${run_mobile_tests}" arg2="true" /> </condition> @@ -899,7 +890,7 @@ <echo message="Deleting old results and files from previous testsuite build."/> <delete dir="${mustellagen.dir}" quiet="true"/> <!-- get rid of old runid prop file, in case we don't create a new one --> - <delete verbose="true" file="${sdk.mustella.dir}/runid.properties" failonerror="false" quiet="true" /> + <delete verbose="true" file="${mustella.dir}/tests/runid.properties" failonerror="false" quiet="true" /> <!-- delete file="${mustella.dir}/mustella.swc" failonerror="false"/ --> <delete quiet="true" failonerror="false" includeEmptyDirs="true"> <fileset dir="${mustella.dir}"> @@ -953,7 +944,7 @@ <exclude name="RuntimeLocalization/RTL_SparkSkin/SWFs/Assets/bundles/flex20/enCustomBundle2_Flex20.swc"/> </fileset> </delete> - <delete dir="${sdk.mustella.dir}/MarshallPlan/SWFs/assets/MyUtils"/> + <delete dir="tests/MarshallPlan/SWFs/assets/MyUtils"/> </target> <property name="exclude_flag" value="" /> @@ -1124,21 +1115,21 @@ <delete quiet="true"> <fileset dir="${sdk.dir}/frameworks/componentSmoke" includes="*.cache"/> </delete> - <property name="frameworks.dir" value="${sdk.dir}/frameworks" /> + <property name="frameworks.dir" value="${mustella.dir}/../frameworks" /> <property name="mxmlc.dir" value="${sdk.dir}/bin" /> <!-- property name="mxmlc.exe" value="mxmlc.exe" / --> <!-- remove? property name="pfchange" value="workspace" / --> <pathconvert pathSep=";" property="sdk.mustella.mxmlfiles" refid="sdk.mustella.fileset"/> - <!-- <echo>stuff we're passing into compile: ${sdk.mustella.mxmlfiles}</echo> --> + <!-- echo>stuff we're passing into compile: ${sdk.mustella.mxmlfiles}</echo --> - <!-- <echo>Shell is currently ${shell}</echo> --> + <!-- echo>Shell is currently ${shell}</echo --> <antcall target="shells" /> <!-- write the target files to a file --> <taskdef name="namesToFile" classname="mustella.WriteFileNames" classpathref="flex.test.classpath"/> <namesToFile list="${sdk.mustella.mxmlfiles}" file="${mustella.dir}/test_files.tmp"/> - + <java classname="mustella.CompileMustellaSwfs" fork="${fork_compile}" resultproperty="jreturn" > <classpath refid="flex.test.classpath"/> <sysproperty key="mxmlcdir" value="${mxmlc.dir}" /> @@ -1373,7 +1364,7 @@ <target name="zip_tests_only" depends="makemustellaswc" description="- package tests,jars,excludes, and results"> <!-- assumption: we have a runid; we need it to get the failures relevant to the current build --> - <property file="${sdk.mustella.dir}/runid.properties" /> + <property file="${mustella.dir}/tests/runid.properties" /> <property name="current.run.id" value="${run_id}" /> <echo>run id is ${current.run.id} </echo> @@ -1448,7 +1439,7 @@ </target> <target name="unzipSwfs" description="Unzip previously compiled test swfs" > - <unzip src="${mustella.dir}/${testpkg}" dest="${sdk.mustella.dir}" /> + <unzip src="${mustella.dir}/${testpkg}" dest="${mustella.dir}/tests" /> </target> @@ -1919,7 +1910,7 @@ <chmod perm="777" verbose="true" dir="${sdk.dir}/frameworks" includes="*" > </chmod> <chmod perm="777" verbose="true" maxparallel="50"> - <dirset dir="${sdk.mustella.dir}" > + <dirset dir="${mustella.dir}/tests" > </dirset> </chmod> <antcall target="delete_cache"> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55751650/mustella/java/src/mustella/CompileMustellaSwfs.java ---------------------------------------------------------------------- diff --git a/mustella/java/src/mustella/CompileMustellaSwfs.java b/mustella/java/src/mustella/CompileMustellaSwfs.java index ba2872e..2f65d6b 100644 --- a/mustella/java/src/mustella/CompileMustellaSwfs.java +++ b/mustella/java/src/mustella/CompileMustellaSwfs.java @@ -107,8 +107,6 @@ public class CompileMustellaSwfs extends Thread { private static String mustella_framework_dir = null; - private static String mustella_test_dir = null; - private static String apollo_location = ""; private static String file_of_tests = ""; @@ -323,11 +321,6 @@ public class CompileMustellaSwfs extends Thread { } catch (Exception e) { } - try { - mustella_test_dir = System.getProperty ("sdk.mustella.dir"); - } catch (Exception e) { - } - try { flex_version = Double.parseDouble(System.getProperty ("flex_version")); } catch (Exception e) { @@ -405,6 +398,7 @@ public class CompileMustellaSwfs extends Thread { } + if (System.getProperty ("socket_mixin")!=null) { socket_mixin = System.getProperty ("socket_mixin"); if (socket_mixin != null && !socket_mixin.equals ("")) @@ -703,6 +697,7 @@ public class CompileMustellaSwfs extends Thread { /// System.out.println ("This is the filename I've fixed: " + s); + return "-includes=" +s; } @@ -872,10 +867,8 @@ public class CompileMustellaSwfs extends Thread { } } + front = front.substring (front.indexOf("mustella" + File.separator + "tests")+15); front = front.replaceAll ("\\\\", "/") + "/"; - int test_index = front.indexOf(mustella_test_dir); - int test_length = mustella_test_dir.length(); - front = front.substring (test_index + test_length + 1); alinc.add ("\"" + transformName( front + extract, "") + "\": 1,"); alinc.add ("\"" + transformName( front + extract, "") + "$" + include_list + "\": 1"); @@ -1045,20 +1038,20 @@ public class CompileMustellaSwfs extends Thread { compiler.setDir(dir); - /** + /** System.out.println ("************"); System.out.println ("************"); String defaultArgsDebugString = new String(); - for(int i = 0; i < defaultArgs.size(); ++i){ - defaultArgsDebugString += defaultArgs.get(i); + for(int i = 0; i < defaultArgs.length; ++i){ + defaultArgsDebugString += defaultArgs[i]; } - + System.out.println ("mxml: " + mxml); System.out.println ("defaultArgs: " + defaultArgsDebugString); **/ - + compiler.compile(mxml, defaultArgs); RuntimeExecHelper rh = compiler.getRuntimeExecHelper(); @@ -1068,7 +1061,7 @@ public class CompileMustellaSwfs extends Thread { // System.out.println("rh output: " + rh.getOutputText()); // System.out.println("rh error out: " + rh.getErrorText()); // System.out.println("exit value=" + rh.getExitValue()); - + String failedFile=null; // InsertErrorResult ier = null; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55751650/mustella/mini_run.sh ---------------------------------------------------------------------- diff --git a/mustella/mini_run.sh b/mustella/mini_run.sh index 5aeca2e..96e9139 100755 --- a/mustella/mini_run.sh +++ b/mustella/mini_run.sh @@ -551,16 +551,10 @@ do ### set a -D property for ant run_this_script. ### otherwise, run a whole directory ### the other args are the same, however. :( - mustellaTestDir=${MUSTELLA_TEST_DIR} - if [ ! -d "$mustellaTestDir" ] - then - mustellaTestDir="tests"; - fi - - tmpx=$mustellaTestDir/${i} - + tmpx=tests/${i} # echo "Looking for $tmpx" + end=`echo $tmpx | awk -F"." '{print $NF}'` if [ ! -f "$tmpx" ] && [ ! -d "$tmpx" ]
