You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by kk...@apache.org on 2014/05/12 00:58:49 UTC
svn commit: r1593868 - in /gump/metadata/project: tomcat-tc7.xml
tomcat-trunk.xml
Author: kkolinko
Date: Sun May 11 22:58:48 2014
New Revision: 1593868
URL: http://svn.apache.org/r1593868
Log:
Split Tomcat 7 tests into BIO and NIO connector ones,
like it is already done for Tomcat 8.
Modified:
gump/metadata/project/tomcat-tc7.xml
gump/metadata/project/tomcat-trunk.xml
Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1593868&r1=1593867&r2=1593868&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Sun May 11 22:58:48 2014
@@ -104,7 +104,7 @@
from="Bill Barker <billbarker@apache.org>" />
</project>
- <project name="tomcat-tc7.0.x-test">
+ <project name="tomcat-tc7.0.x-test-bio">
<package>org.apache.catalina</package>
<ant target="test">
<depend property="jdt.jar" project="eclipse" id="jdtcore" />
@@ -126,7 +126,12 @@
<property name="tomcat-dbcp.home" project="tomcat-tc7.0.x-dbcp"
reference="home" />
<property name="examples.sources.skip" value="true" />
+ <property name="test.temp" value="output/test-tmp-BIO" />
+ <property name="test.reports" value="output/logs-BIO" />
<property name="test.accesslog" value="true" />
+ <property name="execute.test.apr" value="false"/>
+ <property name="execute.test.bio" value="true"/>
+ <property name="execute.test.nio" value="false"/>
</ant>
<depend project="ant" inherit="runtime" />
@@ -137,7 +142,52 @@
<license name="LICENSE" />
- <report nested="output/build/logs" />
+ <report nested="output/logs-BIO" />
+ <report nested="output/test-tmp-BIO/logs" />
+
+ <nag to="dev@tomcat.apache.org"
+ from="Bill Barker <billbarker@apache.org>" />
+ </project>
+ <project name="tomcat-tc7.0.x-test-nio">
+ <package>org.apache.catalina</package>
+ <ant target="test">
+ <depend property="jdt.jar" project="eclipse" id="jdtcore" />
+ <depend property="tomcat-dbcp.jar" project="tomcat-tc7.0.x-dbcp" id="tomcat-dbcp" />
+ <property name="tomcat-dbcp-src.jar" project="tomcat-tc7.0.x-dbcp"
+ id="tomcat-dbcp-src" reference="jarpath" />
+ <depend property="commons-daemon.jar" project="commons-daemon"
+ id="commons-daemon" />
+ <property name="commons-daemon.native.src.tgz" project="commons-daemon"
+ id="native-distro" reference="outputpath" />
+ <property name="tomcat-native.tar.gz" project="commons-daemon"
+ id="native-distro" reference="outputpath" />
+ <depend property="junit.jar" project="junit" id="junit"/>
+ <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+ <property name="commons-pool.home" project="commons-pool"
+ path="." />
+ <property name="commons-dbcp.home" project="commons-dbcp"
+ path="." />
+ <property name="tomcat-dbcp.home" project="tomcat-tc7.0.x-dbcp"
+ reference="home" />
+ <property name="examples.sources.skip" value="true" />
+ <property name="test.temp" value="output/test-tmp-NIO" />
+ <property name="test.reports" value="output/logs-NIO" />
+ <property name="test.accesslog" value="true" />
+ <property name="execute.test.apr" value="false"/>
+ <property name="execute.test.bio" value="false"/>
+ <property name="execute.test.nio" value="true"/>
+ </ant>
+
+ <depend project="ant" inherit="runtime" />
+ <depend project="tomcat-tc7.0.x"/>
+
+ <work nested="output/build/webapps/examples/WEB-INF/classes"/>
+ <work nested="output/testclasses" />
+
+ <license name="LICENSE" />
+
+ <report nested="output/logs-NIO" />
+ <report nested="output/test-tmp-NIO/logs" />
<nag to="dev@tomcat.apache.org"
from="Bill Barker <billbarker@apache.org>" />
Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1593868&r1=1593867&r2=1593868&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Sun May 11 22:58:48 2014
@@ -99,6 +99,7 @@
<property name="test.temp" value="output/test-tmp-BIO" />
<property name="test.reports" value="output/logs-BIO" />
<property name="test.accesslog" value="true" />
+ <property name="execute.test.apr" value="false"/>
<property name="execute.test.bio" value="true"/>
<property name="execute.test.nio" value="false"/>
<property name="execute.test.nio2" value="false"/>
@@ -137,6 +138,7 @@
<property name="test.temp" value="output/test-tmp-NIO" />
<property name="test.reports" value="output/logs-NIO" />
<property name="test.accesslog" value="true" />
+ <property name="execute.test.apr" value="false"/>
<property name="execute.test.bio" value="false"/>
<property name="execute.test.nio" value="true"/>
<property name="execute.test.nio2" value="false"/>
@@ -175,6 +177,7 @@
<property name="test.accesslog" value="true" />
<property name="test.temp" value="output/test-tmp-NIO2" />
<property name="test.reports" value="output/logs-NIO2" />
+ <property name="execute.test.apr" value="false"/>
<property name="execute.test.bio" value="false"/>
<property name="execute.test.nio" value="false"/>
<property name="execute.test.nio2" value="true"/>