You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/02/07 21:02:40 UTC

[tomcat] branch 10.0.x updated: Fix individual test targets

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new 93deffc  Fix individual test targets
93deffc is described below

commit 93deffc9604173d95b49c20668e5c5e53276d6f9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 7 21:01:12 2022 +0000

    Fix individual test targets
---
 build.xml                  | 8 ++++----
 webapps/docs/changelog.xml | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 44700f6..2c83901 100644
--- a/build.xml
+++ b/build.xml
@@ -1838,7 +1838,7 @@
   <property name="junit.formatter.extension" value=".txt" />
 
   <target name="test" description="Runs the JUnit test cases"
-          depends="setup-jacoco,test-nio,test-nio2,test-apr,coverage-report,test-status" />
+          depends="test-nio,test-nio2,test-apr,coverage-report,test-status" />
 
   <target name="test-status"
           description="Analyses logs directory and reports on skipped tests, test failures and test errors">
@@ -1876,19 +1876,19 @@
   </target>
 
   <target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors."
-          depends="test-compile,deploy,test-openssl-exists" if="${execute.test.nio}">
+          depends="setup-jacoco,test-compile,deploy,test-openssl-exists" if="${execute.test.nio}">
     <runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
               extension=".NIO" />
   </target>
 
   <target name="test-nio2" description="Runs the JUnit test cases for NIO2. Does not stop on errors."
-          depends="test-compile,deploy,test-openssl-exists" if="${execute.test.nio2}">
+          depends="setup-jacoco,test-compile,deploy,test-openssl-exists" if="${execute.test.nio2}">
     <runtests protocol="org.apache.coyote.http11.Http11Nio2Protocol"
               extension=".NIO2" />
   </target>
 
   <target name="test-apr" description="Runs the JUnit test cases for APR. Does not stop on errors."
-          depends="test-compile,deploy,test-apr-exists,test-openssl-exists"
+          depends="setup-jacoco,test-compile,deploy,test-apr-exists,test-openssl-exists"
           if="${apr.exists}">
     <runtests protocol="org.apache.coyote.http11.Http11AprProtocol"
               extension=".APR" />
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5dacc35..0f1ef4d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,10 @@
         Use LF line endings for text files in JARs to support reproducible
         builds across different operating systems. (markt)
       </scode>
+      <fix>
+        Fix dependencies for individual test targets in Ant build file. Based on
+        <pr>468</pr> provided by Totoo chenyonghui. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>

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