flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1437863 - in /flex/sdk/branches/develop/mustella: build.xml mini_run.sh
Date Thu, 24 Jan 2013 05:39:37 GMT
Author: aharui
Date: Thu Jan 24 05:39:37 2013
New Revision: 1437863

URL: http://svn.apache.org/viewvc?rev=1437863&view=rev
Log:
tweak mini_run so you can run regular, apollo and mobile tests without screwing around with
local.properties.

Modified:
    flex/sdk/branches/develop/mustella/build.xml
    flex/sdk/branches/develop/mustella/mini_run.sh

Modified: flex/sdk/branches/develop/mustella/build.xml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/build.xml?rev=1437863&r1=1437862&r2=1437863&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/build.xml (original)
+++ flex/sdk/branches/develop/mustella/build.xml Thu Jan 24 05:39:37 2013
@@ -141,6 +141,10 @@
 
     <property name="require_this_directory_too" value="" />
 
+    <condition property="adl_extras" value="-screensize 640x960:640x960 -profile mobileDevice
-XscreenDPI 240" >
+        <istrue value="${run_mobile_tests}" />
+    </condition>
+    
     <!-- host_os_name (formerly real_os_name) is the machine which is compiling. -->
     <condition property="host_os_name" value="mac" >
         <os family="mac" />
@@ -1067,12 +1071,6 @@
     <property name="result_include" value="-includes=SendFormattedResultsToLog" />
     <property name="exit_include" value="" />
 
-   <condition property="get_results_from_log" value="true" else="false" >
-		<not>
-			<isset property="${run_mobile_tests}" />
-		</not>
-    </condition>
-
     <property name="build_version" value="${server}" />
 
     <target name="fast_run_filesets" depends="get_os,setup_mac,setup_windows,setup_linux">

Modified: flex/sdk/branches/develop/mustella/mini_run.sh
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/mini_run.sh?rev=1437863&r1=1437862&r2=1437863&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/mini_run.sh (original)
+++ flex/sdk/branches/develop/mustella/mini_run.sh Thu Jan 24 05:39:37 2013
@@ -304,12 +304,6 @@ do
             continue
         fi
 
-        if [ "$run_mobile_tests" = "true" ]
-            then
-            use_wire=false
-        fi
-
-
         if [ "$i" = "-keep" ]
             then
             keep=true
@@ -323,6 +317,13 @@ do
             continue
         fi
 
+        if [ "$i" = "-mobile" ]
+            then
+            apollo_run=" -Duse_apollo=true -Drun_mobile_tests=true"
+            run_mobile_tests=true
+            continue
+        fi
+
         if [ "$i" = "-browser" ]
             then
             browser_run=" -Duse_browser=true"
@@ -736,7 +737,7 @@ do
             done
 
             # local.properties should be optional
-            if [ -f "local.properties" ]
+            if [ -f "local.properties" ] && "${run_mobile_tests}" != "true" ]
                 then
                 run_mobile_tests=`egrep "run_mobile_tests" local.properties | egrep -v "^#"
| awk -F"=" '{print $2}'`
             fi



Mime
View raw message