Skip to content

Improve test feedback by logging the availability checks for OpenSSL and Tomcat Native libraries when they're missing #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
csutherl wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −2
Open

Improve test feedback by logging the availability checks for OpenSSL and Tomcat Native libraries when they're missing #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2109,13 +2109,13 @@
</target>

<target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors."
depends="-test-name-default,setup-jacoco,test-compile,deploy,test-openssl-exists" if="${execute.test.nio}">
depends="-test-name-default,setup-jacoco,test-compile,deploy,test-openssl-exists,test-tcnative-exists" if="${execute.test.nio}">
<runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
extension=".NIO" />
</target>

<target name="test-only-nio" description="Runs the JUnit test cases or NIO without test preparations. Does not stop on errors."
depends="-test-name-default,setup-jacoco,test-openssl-exists" if="${execute.test.nio}">
depends="-test-name-default,setup-jacoco,test-openssl-exists,test-tcnative-exists" if="${execute.test.nio}">
<runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
extension=".NIO" />
</target>
Expand All @@ -2134,6 +2134,24 @@
</and>
</or>
</condition>
<echo message="OpenSSL is not available. OpenSSL-related tests will be skipped or may fail." level="warning" unless:set="test.openssl.exists"/>
</target>

<target name="test-tcnative-exists" description="Checks for the Tomcat Native library">
<condition property="test.tcnative.exists">
<or>
<resourcecount when="gt" count="0">
<fileset dir="${test.apr.loc}" includes="libtcnative-*.so" erroronmissingdir="false"/>
</resourcecount>
<resourcecount when="gt" count="0">
<fileset dir="${test.apr.loc}" includes="libtcnative-*.dylib" erroronmissingdir="false"/>
</resourcecount>
<resourcecount when="gt" count="0">
<fileset dir="${test.apr.loc}" includes="tcnative-*.dll" erroronmissingdir="false"/>
</resourcecount>
</or>
</condition>
<echo message="Tomcat Native is not available. Tomcat Native (JNI) tests will be skipped." level="warning" unless:set="test.tcnative.exists"/>
</target>

<target name="test-httpd-exists" description="Checks for the httpd binary">
Expand Down
7 changes: 7 additions & 0 deletions webapps/docs/changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,13 @@
<update>
Update Derby to 10.17.1.0. (markt)
</update>
<add>
Add warning when OpenSSL binary is not found. (csutherl)
</add>
<add>
Add check for Tomcat Native library, and log warning when it's not found
to make it easier to see when it's not used by the suite. (csutherl)
</add>
<!-- Entries for backport and removal before 12.0.0-M1 below this line -->
</changelog>
</subsection>
Expand Down