Author: ozizka(a)redhat.com
Date: 2009-08-25 22:10:16 -0400 (Tue, 25 Aug 2009)
New Revision: 694
Added:
trunk/jsfunit/testdata/netbeans-profiler/
trunk/jsfunit/testdata/netbeans-profiler/jfluid-server.jar
trunk/jsfunit/testdata/pom_patches/
trunk/jsfunit/testdata/pom_patches/pom-JmsAndDatasources.patch
trunk/jsfunit/testdata/pom_patches/pom-noJmsAndDatasources.patch
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson shell script: Test runs separated to prevent OOME.
* jfluid-server.jar for netbeans-profiler profile added.
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-25 21:51:55 UTC (rev 693)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-26 02:10:16 UTC (rev 694)
@@ -42,7 +42,20 @@
#echo -e "USER hudson hudson hudson hudson\nNICK HudsonBot\nJOIN
#embjopr\nPRIVMSG #embjopr :`hostname`\nQUIT\n" |nc
irc.devel.redhat.com 6667 || :
echo `hostname`:4000 >> /tmp/embjopr-debug.log
- 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
- sleep 5
+ ## Remove app tests - because of the memory leak, we need to split the test run to
more parts.
+ if [ -n "$TEST_SUITE_PART" ]; then
+ svn revert pom.xml
+ patch -p0 < /home/hudson/ozizka/JoprEmbedded/pom-JmsAndDatasources.patch
+ fi
+ #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 JmsAndDatasources noJmsAndDatasources ; do
+ svn revert pom.xml
+ patch -p0 < testdata/pom_patches/pom-$part.patch
+ 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
+ done
+
+
+ sleep 5
Added: trunk/jsfunit/testdata/netbeans-profiler/jfluid-server.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsfunit/testdata/netbeans-profiler/jfluid-server.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsfunit/testdata/pom_patches/pom-JmsAndDatasources.patch
===================================================================
--- trunk/jsfunit/testdata/pom_patches/pom-JmsAndDatasources.patch
(rev 0)
+++ trunk/jsfunit/testdata/pom_patches/pom-JmsAndDatasources.patch 2009-08-26 02:10:16 UTC
(rev 694)
@@ -0,0 +1,30 @@
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 683)
++++ pom.xml (working copy)
+@@ -524,25 +524,9 @@
+ <include>**/jsfunit/*Test.java</include>
+ -->
+
+- <include>**/as5/*Test.java</include>
+- <include>**/jsfunit/*Test.java</include>
+-
+-
<include>**/as5/connfactories/*Test.java</include>
+
<include>**/as5/datasources/*Test.java</include>
+
<include>**/as5/jmsDestinations/*Test.java</include>
+
+- <include>**/as5/app/war/*Test.java</include>
+-
<include>**/as5/app/embwar/*Test.java</include>
+- <include>**/as5/app/ear/*Test.java</include>
+- <include>**/as5/app/rar/*Test.java</include>
+- <include>**/as5/app/ejb/*Test.java</include>
+-
+-
<include>**/as5/connectors/*Test.java</include>
+- <include>**/as5/sbm/*Test.java</include>
+- <include>**/as5/scripts/*Test.java</include>
+-
<!--<include>**/as5/hbn/*Test.java</include>-->
+- <include>**/as5/jbcache/*Test.java</include>
+-
+ <!--
+ -->
+ </includes>
Added: trunk/jsfunit/testdata/pom_patches/pom-noJmsAndDatasources.patch
===================================================================
--- trunk/jsfunit/testdata/pom_patches/pom-noJmsAndDatasources.patch
(rev 0)
+++ trunk/jsfunit/testdata/pom_patches/pom-noJmsAndDatasources.patch 2009-08-26 02:10:16
UTC (rev 694)
@@ -0,0 +1,13 @@
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 683)
++++ pom.xml (working copy)
+@@ -528,8 +528,6 @@
+ <include>**/jsfunit/*Test.java</include>
+
+
<include>**/as5/connfactories/*Test.java</include>
+-
<include>**/as5/datasources/*Test.java</include>
+-
<include>**/as5/jmsDestinations/*Test.java</include>
+
+ <include>**/as5/app/war/*Test.java</include>
+
<include>**/as5/app/embwar/*Test.java</include>