Only download Checkstyle if it is going to be used

Add note the Checkstyle is LGPL
Add option (off by default) to fail test target as soon as one test fails.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@980106 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index ca3af1a..3698a4c 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -32,11 +32,13 @@ version.patch=0
 version.suffix=-dev
 
 # ----- Build control flags -----
+# Note enabling validation uses Checkstyle which is LGPL licensed
 execute.validate=false
 execute.test.bio=true
 execute.test.nio=true
 # Still requires APR/native library to be present
 execute.test.apr=true
+test.haltonfailure=false
 
 # ----- Default Base Path for Dependent Packages -----
 # Please note this path must be absolute, not relative,

diff --git a/build.xml b/build.xml
index b51f235..e130a19 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -997,9 +997,11 @@
 
         <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
         <test todir="${tomcat.build}/logs" name="${test.entry}" if="test.entry"/>
-        <batchtest todir="${tomcat.build}/logs" unless="test.entry"
-          errorproperty="test.result.error" failureproperty="test.result.failure" 
-          >
+        <batchtest todir="${tomcat.build}/logs"
+                   unless="test.entry"
+                   errorproperty="test.result.error"
+                      failureproperty="test.result.failure"
+                   haltonfailure="${test.haltonfailure}">
           <fileset dir="test" >
             <!-- Include all by default -->
             <include name="**/Test*.java" />
@@ -1911,7 +1913,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
   <!-- ================ Download and dependency building =================== -->
 
   <target name="download-validate"
-          description="Download components necessary to validate source" >
+          description="Download components necessary to validate source"
+             if="${execute.validate}">
 
     <antcall target="downloadzip">
       <param name="sourcefile" value="${checkstyle.loc}"/>