tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r979849 - in /tomcat/trunk: build.properties.default build.xml
Date Tue, 27 Jul 2010 20:25:35 GMT
Author: markt
Date: Tue Jul 27 20:25:35 2010
New Revision: 979849

URL: http://svn.apache.org/viewvc?rev=979849&view=rev
Log:
Provide control over which connectors are used to run tests - helpful when (as now) only one
of the connectors has issues

Modified:
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=979849&r1=979848&r2=979849&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Jul 27 20:25:35 2010
@@ -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,

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=979849&r1=979848&r2=979849&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jul 27 20:25:35 2010
@@ -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>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message