Author: kkolinko
Date: Fri Feb 14 16:50:00 2014
New Revision: 1568348
URL: http://svn.apache.org/r1568348
Log:
Correct a typo and add a note that the tests are run with Java 7.
Modified:
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/build.xml
Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1568348&r1=1568347&r2=1568348&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Fri Feb 14 16:50:00 2014
@@ -333,6 +333,12 @@ If you are on Windows and want to test t
tcnative-1.dll file into ${tomcat.source}/bin/native/ and it will be copied
into the above directory when the build runs.
+* NOTE: If you configured the build to use a Java 7 JDK (if the
+"java.7.home" property has been defined) the tests will be run with Java 7.
+
+The version of Java that was actually used to run the tests is reported by
+"org.apache.catalina.util.TestServerInfo" test class.
+
(7.2) Running a single test
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1568348&r1=1568347&r2=1568348&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Feb 14 16:50:00 2014
@@ -1354,7 +1354,7 @@
<!-- Exclude the tests known to fail -->
<exclude name="org/apache/catalina/tribes/test/**" />
<!-- Exclude both sets of WebSocket tests unless Java 7 is
-->
- <!-- present as the WebSocket exmaples (used by the tests) won't
-->
+ <!-- present as the WebSocket examples (used by the tests) won't
-->
<!-- build without it.
-->
<exclude unless="java.7.home"
name="org/apache/catalina/websocket/**" />
<exclude unless="java.7.home"
name="org/apache/tomcat/websocket/**" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
