harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r517525 - in /harmony/enhanced/jdktools/trunk: make/properties.xml modules/jpda/build.xml modules/launcher/build.xml modules/tools/build.xml
Date Tue, 13 Mar 2007 04:40:49 GMT
Author: smishura
Date: Mon Mar 12 21:40:48 2007
New Revision: 517525

URL: http://svn.apache.org/viewvc?view=rev&rev=517525
Log:
Apply patch for HARMONY-3367:
([jdktools] support setting JVM arguments in unit tests)

Modified:
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
    harmony/enhanced/jdktools/trunk/modules/tools/build.xml

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=517525&r1=517524&r2=517525
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Mon Mar 12 21:40:48 2007
@@ -36,6 +36,7 @@
     <property name="hy.test.forkmode" value="once" />
     <property name="hy.test.timeout" value="900000" />
     <property name="hy.test.vm.name" value="ibm" />
+    <property name="hy.test.vmargs" value="" />
 
     <!-- Conditions for operating systems -->
     <condition property="is.windows">

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?view=diff&rev=517525&r1=517524&r2=517525
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Mon Mar 12 21:40:48 2007
@@ -129,11 +129,16 @@
                        dir="${hy.tests.reports}"
                        jvm="${test.debugger.jvm}">
 
+            <!-- JVM arguments for debugger process -->
+            <jvmarg line="${hy.test.vmargs}" />
+            
+            <!-- JVM path and arguments for debuggee process -->
+            <jvmarg value="-Djpda.settings.debuggeeJavaPath=${test.debuggee.jvm}" />
+            <jvmarg value="-Djpda.settings.debuggeeVMExtraOptions=${hy.test.vmargs}" />
+
             <classpath>
                 <pathelement path="${tests.build.output}/classes"/>
             </classpath>
-
-            <jvmarg value="-Djpda.settings.debuggeeJavaPath=${test.debuggee.jvm}" />
 
             <formatter type="xml" />
 

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/build.xml?view=diff&rev=517525&r1=517524&r2=517525
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/build.xml Mon Mar 12 21:40:48 2007
@@ -71,7 +71,7 @@
           <exec failonerror="true"
                  executable="${test.jre.home}/bin/java${exe.suffix}"
                         dir="${hy.tests.reports}">
-              <arg line="-version" />
+              <arg line="-version ${hy.test.vmargs}" />
           </exec>
       </target>
 

Modified: harmony/enhanced/jdktools/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/build.xml?view=diff&rev=517525&r1=517524&r2=517525
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/tools/build.xml Mon Mar 12 21:40:48 2007
@@ -181,6 +181,8 @@
                        dir="${hy.tests.reports}"
                        jvm="${test.jre.home}/bin/java">
 
+            <jvmarg line="${hy.test.vmargs}" />
+
             <classpath>
                 <pathelement path="${tests.build.output}/classes"/>
                 <pathelement path="${hy.jdk}/lib/tools.jar"/>



Mime
View raw message