[jboss-cvs] JBossAS SVN: r94071 - in branches/Branch_5_x/testsuite: imports and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: smcgowan at redhat.com
Date: 2009-09-28 14:40:36 -0400 (Mon, 28 Sep 2009)
New Revision: 94071

Modified:
   branches/Branch_5_x/testsuite/build.sh
   branches/Branch_5_x/testsuite/imports/server-config.xml
Log:
JBAS-7287 - adjust heap setting when running with 64-bit JVM

Modified: branches/Branch_5_x/testsuite/build.sh
===================================================================
--- branches/Branch_5_x/testsuite/build.sh	2009-09-28 17:27:37 UTC (rev 94070)
+++ branches/Branch_5_x/testsuite/build.sh	2009-09-28 18:40:36 UTC (rev 94071)
@@ -151,7 +151,7 @@
     ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
 
     # add some more memory
-    ANT_OPTS="$ANT_OPTS -Xmx1024m"
+    ANT_OPTS="$ANT_OPTS -Xms256m -Xmx1024m -XX:-UseGCOverheadLimit"
 
     # prevent default config beeing used
     ANT_OPTIONS="--noconfig $ANT_OPTIONS"

Modified: branches/Branch_5_x/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_5_x/testsuite/imports/server-config.xml	2009-09-28 17:27:37 UTC (rev 94070)
+++ branches/Branch_5_x/testsuite/imports/server-config.xml	2009-09-28 18:40:36 UTC (rev 94071)
@@ -225,7 +225,7 @@
       </server>
       <server name="tomcat-sso" host="${node0}">
          <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx256m" />
+         <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <jvmarg value="${jpda.cmdline}" />
@@ -245,7 +245,7 @@
       <server name="tomcat-webctx" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx256m" />
+         <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
@@ -254,7 +254,7 @@
       <server name="tomcat-federation" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-Xms128m" />
-         <jvmarg value="-Xmx256m" />
+         <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />