From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 28 Jul 2010 15:58:30 +0000 (+0000)
Subject: Only download Checkstyle if it is going to be used
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b716c8d5039e5bf93e18d89055fc7d44d342c8b5;p=tomcat7.0

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 ca3af1aa5..3698a4c32 100644
--- 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 b51f23546..e130a195a 100644
--- 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}"/>