Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Derby Development" <derby-dev@db.apache.org>
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r429550 - in /db/derby/code/trunk/java/testing:
 README.htm
 org/apache/derbyTesting/functionTests/harness/NetServer.java
Date: Tue, 08 Aug 2006 03:16:23 -0000
To: derby-commits@db.apache.org
From: fuzzylogic@apache.org
Message-Id: <20060808031624.681B41A981A@eris.apache.org>

Author: fuzzylogic
Date: Mon Aug  7 20:16:23 2006
New Revision: 429550

URL: http://svn.apache.org/viewvc?rev=429550&view=rev
Log:
DERBY-1614: Do not set any heap size flags or network server apart from those
specified by the jvmflags property.

Modified:
    db/derby/code/trunk/java/testing/README.htm
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java

Modified: db/derby/code/trunk/java/testing/README.htm
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/README.htm?rev=429550&r1=429549&r2=429550&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/README.htm (original)
+++ db/derby/code/trunk/java/testing/README.htm Mon Aug  7 20:16:23 2006
@@ -1586,7 +1586,9 @@
           <br>
         </li>
         <li>jvmflags - sets specific jvm properties for each jvm instantiated by the
-test harness, for instance for setting initial memory, and heap size, or other properties
+test harness, for instance for setting initial and maximum heap size (note that setting 
+only initial size or only max size may cause incompatibilities with heap settings picked
+up from harness property files or from the command line), or other properties
 that need to be passed on to the jvm, separated by '^'. This property
 can be set on the commandline for either RunTest or RunSuite, or in one
 of the properties files used by the tests. The property jvmflags
@@ -1595,7 +1597,7 @@
 because the 'highest' level properties are passed to the jvm last. Setting this property
 for a test that runs with useprocess=false cannot have any effect.
 Example: <br>
-          <small>java -Djvmflags=ms32M^-mx128M
+          <small>java -Djvmflags=-Xms32M^-Xmx128M
 org.apache.derbyTesting.functionTests.RunTest lang/streamingColumn.java</small><br>
           <br>
         </li>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java?rev=429550&r1=429549&r2=429550&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java Mon Aug  7 20:16:23 2006
@@ -164,22 +164,10 @@
 		if ( (clPath != null) && (clPath.length()>0) )
 		    jvm.setClasspath(clPath);
 
-        boolean setJvmFlags = false;
         if ( (jvmflags != null) && (jvmflags.length()>0) ) {
             jvm.setFlags(jvmflags);
-            setJvmFlags = true;
-        }
-
-
-        if (!jvmName.equals("jview"))
-        {
-            if (setJvmFlags && ((jvmflags.indexOf("-ms") == -1) || (jvmflags.indexOf("-Xms") == -1)))
-            // only setMs if no starting memory was given
-                jvm.setMs(16*1024*1024); // -ms16m
-            if (setJvmFlags && ((jvmflags.indexOf("-mx") == -1) || (jvmflags.indexOf("-Xmx") == -1)))
-            // only setMx if no max memory was given
-                jvm.setMx(32*1024*1024); // -mx32m
-            jvm.setNoasyncgc(true); // -noasyncgc
+            // Set no flags by default (DERBY-1614).
+            // The jvmflags property can be used to set any kind of JVM option.
         }
 
         jvmProps.addElement("derby.system.home=" + homeDirName);