Author: jfrederic.clere(a)jboss.com Date: 2008-11-27 11:57:06 -0500 (Thu, 27 Nov 2008) New Revision: 2077 Modified: trunk/mod_cluster/test/java/build.properties.default trunk/mod_cluster/test/java/build.xml trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java Log: Remove the JBWEB_117 that are not mod_cluster tests. Modified: trunk/mod_cluster/test/java/build.properties.default =================================================================== --- trunk/mod_cluster/test/java/build.properties.default 2008-11-27 15:46:00 UTC (rev 2076) +++ trunk/mod_cluster/test/java/build.properties.default 2008-11-27 16:57:06 UTC (rev 2077) @@ -1,3 +1,5 @@ +test.failonerror=true + base-apache.loc=http://archive.apache.org/dist/ base.path=${user.home}/java Modified: trunk/mod_cluster/test/java/build.xml =================================================================== --- trunk/mod_cluster/test/java/build.xml 2008-11-27 15:46:00 UTC (rev 2076) +++ trunk/mod_cluster/test/java/build.xml 2008-11-27 16:57:06 UTC (rev 2077) @@ -96,7 +96,31 @@ <jvmarg line="-Dcluster=${cluster}"/> <classpath refid="tomcat.test.classpath"/> </java> + </target> + <target name="extra" depends="compile"> + <copy file="conf/web.xml" todir="${test.classes}/conf"/> + <!-- XXX Need to fix the deployement --> + <java dir="${test.classes}" classname="${test.runner}" fork="yes" failonerror="false"> + <arg value="org.jboss.mod_cluster.Maintest"/> + <jvmarg line="-Dcluster=${cluster} -DTest=testJBWEB_117"/> + <classpath refid="tomcat.test.classpath"/> + </java> + + <!-- XXX Need to fix the deployement --> + <java dir="${test.classes}" classname="${test.runner}" fork="yes" failonerror="false"> + <arg value="org.jboss.mod_cluster.Maintest"/> + <jvmarg line="-Dcluster=${cluster} -Dtest=Test_Chunk_JBWEB_117"/> + <classpath refid="tomcat.test.classpath"/> + </java> + + <!-- This test requires tc/jb native for the moment it fails except if you install by hands the libraries --> + <java dir="${test.classes}" classname="${test.runner}" fork="yes" failonerror="false"> + <arg value="org.jboss.mod_cluster.Maintest"/> + <jvmarg line="-Dcluster=${cluster} -Dtest=Test_Native_JBWEB_117"/> + <classpath refid="tomcat.test.classpath"/> + </java> + </target> <target name="one" depends="compile"> <copy file="conf/web.xml" todir="${test.classes}/conf"/> Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java 2008-11-27 15:46:00 UTC (rev 2076) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java 2008-11-27 16:57:06 UTC (rev 2077) @@ -85,12 +85,15 @@ System.gc(); suite.addTest(new TestSuite(TestStickyForce.class)); System.gc(); + /* XXX The JBWEB_117 tests are not really related to mod_cluster + * Run them one by one using ant one -Dtest=test suite.addTest(new TestSuite(TestJBWEB_117.class)); System.gc(); suite.addTest(new TestSuite(Test_Native_JBWEB_117.class)); System.gc(); suite.addTest(new TestSuite(Test_Chunk_JBWEB_117.class)); System.gc(); + */ } return suite; }