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 375a9d7aa3 Skip JNI tests when testing with Tomcat Native 2.x.x and
later
375a9d7aa3 is described below
commit 375a9d7aa377e9a70c86dcea8ef60aa4b15c9203
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Aug 1 11:58:24 2022 +0100
Skip JNI tests when testing with Tomcat Native 2.x.x and later
---
test/org/apache/tomcat/jni/AbstractJniTest.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/jni/AbstractJniTest.java
b/test/org/apache/tomcat/jni/AbstractJniTest.java
index 84ed1ac29d..3d1b8d74f1 100644
--- a/test/org/apache/tomcat/jni/AbstractJniTest.java
+++ b/test/org/apache/tomcat/jni/AbstractJniTest.java
@@ -32,7 +32,11 @@ public abstract class AbstractJniTest {
} catch (LibraryNotFoundError lnfe) {
nativeLibraryPresent = false;
}
- Assume.assumeTrue("APR Library not found", nativeLibraryPresent);
+ Assume.assumeTrue("Tomcat Native Library not found",
nativeLibraryPresent);
+ if (nativeLibraryPresent) {
+ Assume.assumeTrue("Tomcat Native Library version 2.x.x or later
found which does not support these tests",
+ Library.TCN_MAJOR_VERSION < 2);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
