[jboss-cvs] JBossAS SVN: r79762 - in trunk/testsuite: imports and 1 other directory.

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

Author: dimitris at jboss.org
Date: 2008-10-20 16:12:06 -0400 (Mon, 20 Oct 2008)
New Revision: 79762

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
bump -Xms to 128m for all tests and -Xmx to 256m for most (others are already at -Xmx512) to avoid extensive GCs during testsuite runs.

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-10-20 20:10:55 UTC (rev 79761)
+++ trunk/testsuite/build.xml	2008-10-20 20:12:06 UTC (rev 79762)
@@ -1310,6 +1310,7 @@
 
          <jvmarg line="${junit.jvm.options}"/>
          <!-- Seam deployment tests need more memory -->
+         <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx256m"/>
          <!-- Used for JGroups -->
          <jvmarg value="-Dbind.address=${node0}"/>
@@ -1383,6 +1384,7 @@
 
          <jvmarg line="${junit.jvm.options}"/>
          <!-- Seam deployment tests need more memory -->
+         <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx256m"/>
          <!-- Used for JGroups -->
          <jvmarg value="-Dbind.address=${node0}"/>

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-10-20 20:10:55 UTC (rev 79761)
+++ trunk/testsuite/imports/server-config.xml	2008-10-20 20:12:06 UTC (rev 79762)
@@ -94,7 +94,8 @@
       </server>
       <server name="securitymgr" config="default" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
-         <jvmarg value="-Xmx64m" />
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx256m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="-Djboss.home.dir=${jboss.dist}" />
          <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}default" />
@@ -106,7 +107,7 @@
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
       <server name="scoped-aop-jdk50" host="${node0}">
-          <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
@@ -120,6 +121,8 @@
       <server name="scoped-aop-generated-advisor" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-javaagent:pluggable-instrumentor.jar"/>
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx256m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"/>
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
@@ -128,7 +131,8 @@
       </server>
       <server name="jacc-securitymgr" host="${node0}" config="jacc">
          <jvmarg value="${jpda.cmdline}" />
-         <jvmarg value="-Xmx64m" />
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx256m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="-Djboss.home.dir=${jboss.dist}" />
          <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}jacc" />
@@ -139,21 +143,25 @@
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
       <server name="jacc" host="${node0}">
+         <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx256m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="${jpda.cmdline}" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
-	   <server name="jaspi" host="${node0}"/>
+      <server name="jaspi" host="${node0}"/>
       <server name="tomcat-ssl" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xms128m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
       <server name="tomcat-sso" host="${node0}">
-         <jvmarg value="-Xmx128m" />
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx256m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="${jpda.cmdline}" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
@@ -161,19 +169,24 @@
       </server>
       <server name="opends" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx256m" />         
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
       <server name="tomcat-webctx" host="${node0}">
-          <jvmarg value="${jpda.cmdline}" />
+         <jvmarg value="${jpda.cmdline}" />
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx256m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
       <server name="tomcat-federation" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
-         <jvmarg value="-Xmx128m" />
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx256m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
@@ -754,7 +767,7 @@
          description="The config name passed in as the -c option to jboss"/>
       <attribute name="host" default="${node0}"
          description="The hostname/address passed in as the -b option to jboss" />
-      <attribute name="jvmargs" default="-Xmx64m"
+      <attribute name="jvmargs" default="-Xmx128m"
          description="An additional jvmarg line set after any ${jpda.cmdline}"/>
       <attribute name="jboss.dist" default="${jboss.dist}"
          description="The jboss dist root directory" />