svn commit: r517530 - in /harmony/enhanced/jdktools/trunk: make/properties.xml modules/jpda/build.xml

[sm...@apache.org]

Author: smishura
Date: Mon Mar 12 22:01:46 2007
New Revision: 517530

URL: http://svn.apache.org/viewvc?view=rev&rev=517530
Log:
Correct patch(as agreed on dev-list) for HARMONY-3319:
([jdktools][jpda] JDWP unit tests fail with timeout)

Now default forkmode is 'perBatch'

Modified:
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/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=517530&r1=517529&r2=517530
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Mon Mar 12 22:01:46 2007
@@ -33,7 +33,7 @@
     <property name="hy.javac.maxmem" value="384M" />
 
     <!-- Test run property -->
-    <property name="hy.test.forkmode" value="once" />
+    <property name="hy.test.forkmode" value="perBatch" />
     <property name="hy.test.timeout" value="900000" />
     <property name="hy.test.vm.name" value="ibm" />
     <property name="hy.test.vmargs" value="" />

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=517530&r1=517529&r2=517530
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Mon Mar 12 22:01:46 2007
@@ -108,11 +108,6 @@
         <property name="test.debugger.jvm" value="${test.jre.jvm}" />
         <property name="test.debuggee.jvm" value="${test.jre.jvm}" />
 	
-        <!-- run JPDA tests with forkmode=perBatch if common forkmode=once -->
-        <condition property="hy.jpda.test.forkmode" value="perBatch" else="perTest">
-            <equals arg1="${hy.test.forkmode}" arg2="once" />
-        </condition>
-
         <echo message="Running JPDA tests" />
         <echo message="  Debugger JVM=${test.debugger.jvm}" />
         <echo message="  Debuggee JVM=${test.debuggee.jvm}" />
@@ -120,7 +115,7 @@
         <mkdir dir="${hy.tests.reports}" />
 
         <junit fork="yes"
-                       forkmode="${hy.jpda.test.forkmode}"
+                       forkmode="${hy.test.forkmode}"
                        timeout="${hy.test.timeout}"
                        printsummary="withOutAndErr"
                        errorproperty="test.errors"