[embjopr-commits] EMBJOPR SVN: r768 - in trunk/jsfunit/testdata: pom_patches and 1 other directory.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Tue Sep 22 17:31:53 EDT 2009
Author: ozizka at redhat.com
Date: 2009-09-22 17:31:52 -0400 (Tue, 22 Sep 2009)
New Revision: 768
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
trunk/jsfunit/testdata/pom_patches/pom-Apps.patch
trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch
trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch
trunk/jsfunit/testdata/pom_patches/pom-Jms.patch
trunk/jsfunit/testdata/pom_patches/pom-theRest.patch
Log:
* hudson shell script updated
* POM patch files updated
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 20:59:35 UTC (rev 767)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-22 21:31:52 UTC (rev 768)
@@ -62,9 +62,9 @@
sed "s#<module>jsfunit</module>##g" pom.xml > pom_tmp.xml && mv -f pom_tmp.xml pom.xml
## Dump settings - without explicitely set settings file
- mvn -Pjboss5x help:effective-settings
+ #mvn -Pjboss5x help:effective-settings
## Dump settings - with explicitely set settings file
- mvn $M2_SETTINGS -Pjboss5x help:effective-settings
+ #mvn $M2_SETTINGS -Pjboss5x help:effective-settings
mvn install -Dmaven.test.skip=true --update-snapshots
@@ -76,18 +76,7 @@
#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
- ## 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
- ## Without explicitely set settings file
- mvn -Pjboss5x help:effective-settings
- ## With explicitely set settings file
- mvn $M2_SETTINGS -Pjboss5x help:effective-settings
-
-
#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
if [ -n "$NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi
Modified: trunk/jsfunit/testdata/pom_patches/pom-Apps.patch
===================================================================
--- trunk/jsfunit/testdata/pom_patches/pom-Apps.patch 2009-09-22 20:59:35 UTC (rev 767)
+++ trunk/jsfunit/testdata/pom_patches/pom-Apps.patch 2009-09-22 21:31:52 UTC (rev 768)
@@ -1,34 +1,20 @@
Index: pom.xml
===================================================================
---- pom.xml (revision 699)
+--- pom.xml (revision 759)
+++ pom.xml (working copy)
-@@ -510,39 +510,12 @@
- <failIfNoTests>true</failIfNoTests>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
-- <!--
+@@ -543,25 +543,12 @@
+ <include>**/jsfunit/*Test.java</include>
+ -->
+
- <include>**/as5/*Test.java</include>
-- <include>**/as5/app/ear/*Test.java</include>
- <include>**/as5/app/war/*Test.java</include>
- <include>**/as5/app/embwar/*Test.java</include>
-- <include>**/as5/app/rar/*Test.java</include>
-- <include>**/as5/app/ejb/*Test.java</include>
-- <include>**/as5/jmsDestinations/*Test.java</include>
-- <include>**/as5/datasources/*Test.java</include>
-- <include>**/as5/connfactories/*Test.java</include>
-- <include>**/as5/connectors/*Test.java</include>
- <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/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>
Modified: trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch
===================================================================
--- trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch 2009-09-22 20:59:35 UTC (rev 767)
+++ trunk/jsfunit/testdata/pom_patches/pom-ConnFactories.patch 2009-09-22 21:31:52 UTC (rev 768)
@@ -1,32 +1,18 @@
Index: pom.xml
===================================================================
---- pom.xml (revision 699)
+--- pom.xml (revision 759)
+++ pom.xml (working copy)
-@@ -510,39 +510,8 @@
- <failIfNoTests>true</failIfNoTests>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
-- <!--
-- <include>**/as5/*Test.java</include>
-- <include>**/as5/app/ear/*Test.java</include>
-- <include>**/as5/app/war/*Test.java</include>
-- <include>**/as5/app/embwar/*Test.java</include>
-- <include>**/as5/app/rar/*Test.java</include>
-- <include>**/as5/app/ejb/*Test.java</include>
-- <include>**/as5/jmsDestinations/*Test.java</include>
-- <include>**/as5/datasources/*Test.java</include>
- <include>**/as5/connfactories/*Test.java</include>
-- <include>**/as5/connectors/*Test.java</include>
-- <include>**/jsfunit/*Test.java</include>
-- -->
+@@ -543,25 +543,8 @@
+ <include>**/jsfunit/*Test.java</include>
+ -->
- <include>**/as5/*Test.java</include>
- <include>**/jsfunit/*Test.java</include>
-
-- <include>**/as5/connfactories/*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>
Modified: trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch
===================================================================
--- trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch 2009-09-22 20:59:35 UTC (rev 767)
+++ trunk/jsfunit/testdata/pom_patches/pom-Datasources.patch 2009-09-22 21:31:52 UTC (rev 768)
@@ -1,32 +1,18 @@
Index: pom.xml
===================================================================
---- pom.xml (revision 699)
+--- pom.xml (revision 759)
+++ pom.xml (working copy)
-@@ -510,39 +510,8 @@
- <failIfNoTests>true</failIfNoTests>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
-- <!--
-- <include>**/as5/*Test.java</include>
-- <include>**/as5/app/ear/*Test.java</include>
-- <include>**/as5/app/war/*Test.java</include>
-- <include>**/as5/app/embwar/*Test.java</include>
-- <include>**/as5/app/rar/*Test.java</include>
-- <include>**/as5/app/ejb/*Test.java</include>
-- <include>**/as5/jmsDestinations/*Test.java</include>
- <include>**/as5/datasources/*Test.java</include>
-- <include>**/as5/connfactories/*Test.java</include>
-- <include>**/as5/connectors/*Test.java</include>
-- <include>**/jsfunit/*Test.java</include>
-- -->
+@@ -543,25 +543,8 @@
+ <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/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>
Modified: trunk/jsfunit/testdata/pom_patches/pom-Jms.patch
===================================================================
--- trunk/jsfunit/testdata/pom_patches/pom-Jms.patch 2009-09-22 20:59:35 UTC (rev 767)
+++ trunk/jsfunit/testdata/pom_patches/pom-Jms.patch 2009-09-22 21:31:52 UTC (rev 768)
@@ -1,32 +1,18 @@
Index: pom.xml
===================================================================
---- pom.xml (revision 699)
+--- pom.xml (revision 759)
+++ pom.xml (working copy)
-@@ -510,39 +510,8 @@
- <failIfNoTests>true</failIfNoTests>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
-- <!--
-- <include>**/as5/*Test.java</include>
-- <include>**/as5/app/ear/*Test.java</include>
-- <include>**/as5/app/war/*Test.java</include>
-- <include>**/as5/app/embwar/*Test.java</include>
-- <include>**/as5/app/rar/*Test.java</include>
-- <include>**/as5/app/ejb/*Test.java</include>
- <include>**/as5/jmsDestinations/*Test.java</include>
-- <include>**/as5/datasources/*Test.java</include>
-- <include>**/as5/connfactories/*Test.java</include>
-- <include>**/as5/connectors/*Test.java</include>
-- <include>**/jsfunit/*Test.java</include>
-- -->
+@@ -543,25 +543,8 @@
+ <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/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>
Modified: trunk/jsfunit/testdata/pom_patches/pom-theRest.patch
===================================================================
--- trunk/jsfunit/testdata/pom_patches/pom-theRest.patch 2009-09-22 20:59:35 UTC (rev 767)
+++ trunk/jsfunit/testdata/pom_patches/pom-theRest.patch 2009-09-22 21:31:52 UTC (rev 768)
@@ -1,15 +1,15 @@
Index: pom.xml
===================================================================
---- pom.xml (revision 699)
+--- pom.xml (revision 759)
+++ pom.xml (working copy)
-@@ -527,16 +527,7 @@
+@@ -546,16 +546,6 @@
<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>
More information about the embjopr-commits
mailing list