Author: markt Date: Tue Aug 11 14:45:09 2015 New Revision: 1695314 URL: http://svn.apache.org/r1695314 Log: Invalid path is sufficient - the build script should do the rest.
Modified: tomcat/trunk/build.xml tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1695314&r1=1695313&r2=1695314&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Aug 11 14:45:09 2015 @@ -183,12 +183,9 @@ <property name="test.jvmarg.egd" value="" /> <!-- Location of OpenSSL binary (file name, not directory) --> + <!-- The OpenSSL tests cases be disabled by specifing an invalid path here --> <property name="test.openssl.path" value="" /> - <!-- Accepted version of OpenSSL. The output of "openssl version" - must start with "OpenSSL " plus value of this property. --> - <property name="test.openssl.version" value="1.1.0" /> - <!-- Include .gitignore in src distributions. --> <!-- .git and .gitignore are in defaultexcludes since Ant 1.8.2 --> <defaultexcludes add="**/.git" /> Modified: tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1695314&r1=1695313&r2=1695314&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java Tue Aug 11 14:45:09 2015 @@ -23,17 +23,10 @@ import java.util.List; import java.util.Set; import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; import org.junit.Test; public class TestCipher { - @Before - public void checkVersion() { - Assume.assumeTrue(TesterOpenSSL.TESTS_ENABLED); - } - /* * Checks that every cipher suite returned by OpenSSL is mapped to at least * one cipher suite that is recognised by JSSE or is a cipher suite known Modified: tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java?rev=1695314&r1=1695313&r2=1695314&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java Tue Aug 11 14:45:09 2015 @@ -19,18 +19,11 @@ package org.apache.tomcat.util.net.jsse. import java.util.List; import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; public class TestOpenSSLCipherConfigurationParser { - @Before - public void checkVersion() { - Assume.assumeTrue(TesterOpenSSL.TESTS_ENABLED); - } - @Test public void testDEFAULT() throws Exception { // EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old Modified: tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1695314&r1=1695313&r2=1695314&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Tue Aug 11 14:45:09 2015 @@ -29,10 +29,6 @@ import org.apache.tomcat.util.http.fileu public class TesterOpenSSL { - // These tests can be disabled (e.g. on CI systems with old OpenSSL versions - // by specifying an invalid path to the openssl binary). - public static boolean TESTS_ENABLED; - public static final int VERSION; public static final Set<Cipher> OPENSSL_UNIMPLEMENTED_CIPHERS; @@ -62,9 +58,7 @@ public class TesterOpenSSL { VERSION = -1; } - TESTS_ENABLED = (VERSION != -1); - - HashSet<Cipher> unimplemented = new HashSet<>(); + HashSet<Cipher> unimplemented = new HashSet<>(); // These have been removed from all supported versions. unimplemented.add(Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org