Author: ozizka(a)redhat.com Date: 2009-08-28 01:11:05 -0400 (Fri, 28 Aug 2009) New Revision: 716 Modified: trunk/jsfunit/pom.xml trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson shell script: Added "NO_GC_LIMIT" variable to trigger the no_GC_limit profile * POM: Added the no_GC_limit profile which adds "-XX:-UseGCOverheadLimit" to JVM args. Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-08-28 03:40:47 UTC (rev 715) +++ trunk/jsfunit/pom.xml 2009-08-28 05:11:05 UTC (rev 716) @@ -7,6 +7,8 @@ <jvm.args.debug></jvm.args.debug> <!-- Used by the -Pdebug profile. --> <jvm.args.profiler></jvm.args.profiler> <!-- Used by the -Pprofile profile. --> <jvm.args.exposejmx></jvm.args.exposejmx> <!-- Expose JMX - used to enable the Hibernate statistics. --> + <jvm.args.memory></jvm.args.memory> <!-- Used to prevent OOMEs. See the no_GC_limit profile. --> + <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common> <cargo.jboss.configuration>default</cargo.jboss.configuration><!-- JBoss AS configuration. --> <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address><!-- Address for JBoss AS to bind to. --> @@ -421,8 +423,8 @@ <!-- Raise permgen size, allow classes unloading and permgen sweep --> <!-- xb.builder.useUnorderedSequence=true is the same what run.sh does. --> <!-- See http://www.nabble.com/changes-in-parsing-with-xb-td22478176.html --> - <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} -Xmx1536m -Dxb.builder.useUnorderedSequence=true -XX:-UseGCOverheadLimit -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs> - <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled --> + <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} -Dxb.builder.useUnorderedSequence=true</cargo.jvmargs> + <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled -XX:-UseGCOverheadLimit --> <!-- JBoss configuration - default, all, standard --> <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> <!-- Set explicitely because of Cargo's bad port settings for JBoss. --> @@ -647,8 +649,16 @@ </properties> </profile> + <!-- Expose JMX - used to enable the Hibernate statistics. --> + <profile> + <id>no_GC_limit</id> + <properties> + <jvm.args.memory>-XX:-UseGCOverheadLimit</jvm.args.memory> + </properties> + </profile> + <!-- Profiler profile - enables JBoss Profiler. THIS IS FOR JDK 5 ONLY! --> <profile> <id>profile</id> Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 03:40:47 UTC (rev 715) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 05:11:05 UTC (rev 716) @@ -50,16 +50,23 @@ #mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 - ## Split testsuite to parts, because of OOME - for part in Apps ConnFactories Datasources Jms theRest; do - echo "Running tests for part '$part'..." - svn revert pom.xml - echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..." - patch -p0 < testdata/pom_patches/pom-$part.patch + if [ -n "NO_GC_LIMIT" ] ; then ADD_PROFILES="no_GC_limit"; fi + + if [ -n "$DONT_SPLIT" ] ; then + echo "Running whole testsuite... (DONT_SPLIT)" mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 - #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml - mv target target-$part - done + else + ## Split testsuite to parts, because of OOME + for part in Apps ConnFactories Datasources Jms theRest; do + echo "Running tests for part '$part'..." + svn revert pom.xml + echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..." + patch -p0 < testdata/pom_patches/pom-$part.patch + mvn -Pjboss5x -P$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 + #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml + mv target target-$part + done + fi sleep 5