Provide control over which connectors are used to run tests - helpful when (as now...

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

diff --git a/build.properties.default b/build.properties.default
index ff0568c..ca3af1a 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,6 +33,10 @@ version.suffix=-dev
 
 # ----- Build control flags -----
 execute.validate=false
+execute.test.bio=true
+execute.test.nio=true
+# Still requires APR/native library to be present
+execute.test.apr=true
 
 # ----- Default Base Path for Dependent Packages -----
 # Please note this path must be absolute, not relative,

diff --git a/build.xml b/build.xml
index fb8909d..b51f235 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -952,13 +952,13 @@
   </target>
   
   <target name="test-bio" description="Runs the JUnit test cases for BIO"
-          depends="test-compile,deploy" >
+          depends="test-compile,deploy" if="${execute.test.bio}">
     <runtests protocol="org.apache.coyote.http11.Http11Protocol"
               extension=".BIO.txt" />
   </target>
   
   <target name="test-nio" description="Runs the JUnit test cases for NIO"
-          depends="test-compile,deploy" >
+          depends="test-compile,deploy" if="${execute.test.nio}">
     <runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
               extension=".NIO.txt" />
   </target>
@@ -970,7 +970,8 @@
               extension=".APR.txt" />
   </target>
   
-  <target name="test-apr-exists" description="Checks for APR lib">
+  <target name="test-apr-exists" description="Checks for APR lib"
+          if="${execute.test.apr}">
     <available file="${tomcat.build}/bin/native" property="apr.exists" />
   </target>