[jboss-cvs] JBossAS SVN: r87461 - 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-04-16 17:48:34 -0400 (Thu, 16 Apr 2009)
New Revision: 87461

Modified:
   branches/Branch_5_x/testsuite/build.xml
   branches/Branch_5_x/testsuite/imports/server-config.xml
Log:
adjust jvmargs for start/stop-jboss to be consistent with default config including increase of PermGen

Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml	2009-04-16 21:46:40 UTC (rev 87460)
+++ branches/Branch_5_x/testsuite/build.xml	2009-04-16 21:48:34 UTC (rev 87461)
@@ -632,7 +632,7 @@
    </macrodef>
 
    <macrodef name="wait-on-shutdown">
-      <attribute name="seconds" default="120"/>
+      <attribute name="seconds" default="240"/>
       <attribute name="conf"/>
       <sequential>
          <echo message="Waiting for '@{conf}' server to stop..."/>
@@ -3643,7 +3643,7 @@
     <attribute name="client-serialization-flag"/>    
     <attribute name="serialization-flag"/>
     <sequential>
-      <start-jboss conf="default" jvmargs="-Xmx512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
+      <start-jboss conf="default" jvmargs="-Xms128m -Xmx512m -XX:MaxPermSize=512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
       <wait-on-host/>
       <antcall target="tests-standard-unit-matrix-version-pooled">
         <param name="matrix-configuration" value="@{client-version}-@{label}"/>
@@ -3651,7 +3651,7 @@
         <param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
         <param name="client-serialization-flag" value="@{client-serialization-flag}"/>
       </antcall>
-      <stop-jboss jvmargs="@{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
+      <stop-jboss jvmargs="-Xms128m -Xmx512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
       <wait-on-shutdown conf="default"/>
     </sequential>
   </macrodef>
@@ -3664,7 +3664,7 @@
     <attribute name="client-serialization-flag"/>    
     <attribute name="serialization-flag"/>
     <sequential>
-      <start-jboss conf="default" jvmargs="-Xmx512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
+      <start-jboss conf="default" jvmargs="-Xms128m -Xmx512m -XX:MaxPermSize=512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
       <wait-on-host/>
       <antcall target="tests-standard-unit-matrix-version">
         <param name="matrix-configuration" value="@{client-version}-@{label}"/>
@@ -3672,7 +3672,7 @@
         <param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
         <param name="client-serialization-flag" value="@{client-serialization-flag}"/>
       </antcall>
-      <stop-jboss jvmargs="@{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
+      <stop-jboss jvmargs="-Xms128m -Xmx512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
       <wait-on-shutdown conf="default"/>
     </sequential>
   </macrodef>

Modified: branches/Branch_5_x/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_5_x/testsuite/imports/server-config.xml	2009-04-16 21:46:40 UTC (rev 87460)
+++ branches/Branch_5_x/testsuite/imports/server-config.xml	2009-04-16 21:48:34 UTC (rev 87461)
@@ -908,7 +908,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="-Xmx128m"
+      <attribute name="jvmargs" default="-Xms128m -Xmx512m -XX:MaxPermSize=512m"
          description="An additional jvmarg line set after any ${jpda.cmdline}"/>
       <attribute name="jboss.dist" default="${jboss.dist}"
          description="The jboss dist root directory" />
@@ -924,6 +924,7 @@
             <jvmarg line="${jpda.cmdline}" />
             <jvmarg line="@{jvmargs}" />
             <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+            <sysproperty key="jboss.server.log.threshold" value="DEBUG" />
             <arg value="-c"/>
             <arg value="@{conf}"/>
             <arg value="-b"/>