Skip to content

Commit

Permalink
Fix individual test targets
Browse files Browse the repository at this point in the history
  • Loading branch information
markt-asf committed Feb 7, 2022
1 parent a2207ad commit 93deffc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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" />
Expand Down
4 changes: 4 additions & 0 deletions webapps/docs/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 93deffc

Please sign in to comment.