Skip to content

Commit d3ad84b

Browse files
committed
In fastdebug, disable class with performTestTwoWay
Deadlock in socket() calls to often. Probably bug in jdk
1 parent 6eba89b commit d3ad84b

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

jni/wildfly-openssl.bash

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ DISABLE_testNoExplicitEnabledProtocols="true"
2121
DISABLE_testMultipleEnabledProtocolsWithClientProtocolWithinEnabledRange="true"
2222
DISABLE_testCipherSuiteConverter="true"
2323
DISABLE_testAvailableProtocolsWithTLS13CipherSuites="true"
24+
REMOVE_performTestTwoWayFile="false"
25+
26+
if $JAVA_HOME/bin/java -version 2>&1 | grep fastdebug ; then
27+
REMOVE_performTestTwoWayFile="true"
28+
fi
2429

2530
function addIgnoreImport() {
2631
if ! grep -e "import org.junit.Ignore" "${1}" ; then #do not create duplicated imports
@@ -87,6 +92,14 @@ pushd wildfly-openssl
8792
else
8893
echo "No test ignored"
8994
fi
95+
if [ $REMOVE_performTestTwoWayFile = "true" ] ; then
96+
boffile=`find | grep java/src/test/.*/BasicOpenSSLEngineTest.java`
97+
addIgnoreImport "${boffile}"
98+
sed "s/@Test/@Ignore @Test/g" -i "${boffile}"
99+
# fixing one double ignore
100+
sed "s/@Ignore public void testNoExplicitEnabledProtocols/public void testNoExplicitEnabledProtocols/g" -i "${boffile}"
101+
cat $boffile | grep -e "@Test" -A1
102+
fi
90103
# it is better to set the libssl and libcrypto on our own
91104
# the wildfly-openssl search is just tragic, and the excception throwns out of it are very missleading
92105
# eg "not found ssl library" may be thrown from findCryptoLibray (where findSSL have passed fine)

0 commit comments

Comments
 (0)