From 827be52478eb4cc1deb72bba329f88760b916f99 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:04:25 +0000 Subject: [PATCH 1/4] Ensure SSL Test Shell Script Has Execute Permissions --- compile.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compile.sh b/compile.sh index d760061926..dbe9619abd 100755 --- a/compile.sh +++ b/compile.sh @@ -13,3 +13,9 @@ source ./scripts/testenv/testenvSettings.sh cd ./TKG $MAKE compile + +if [ $(uname) = SunOS ]; then + pwd + ls -ltr + chmod -R 744 ../openjdk/openjdk-jdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh* +fi From 66f7e77b66c7696854bd62bcc35397bc69afa78e Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Tue, 19 Nov 2024 15:11:37 +0000 Subject: [PATCH 2/4] Exclude SSLEngineExplorerMatchedSNI on Solaris x64 --- openjdk/excludes/ProblemList_openjdk8.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openjdk/excludes/ProblemList_openjdk8.txt b/openjdk/excludes/ProblemList_openjdk8.txt index 9bd65f16e9..727270054f 100644 --- a/openjdk/excludes/ProblemList_openjdk8.txt +++ b/openjdk/excludes/ProblemList_openjdk8.txt @@ -14,7 +14,7 @@ # hotspot_all -# compiler/7184394/TestAESMain.java https://github.com/adoptium/infrastructure/issues/2893 +# compiler/7184394/TestAESMain.java https://github.com/adoptium/infrastructure/issues/2893 compiler/7184394/TestAESMain.java https://github.com/adoptium/aqa-tests/issues/1051 linux-s390x,solaris-sparcv9 compiler/intrinsics/sha/TestSHA.java https://github.com/adoptium/aqa-tests/issues/1051 linux-s390x @@ -245,6 +245,7 @@ sun/security/pkcs11/rsa/TestCACerts.java https://github.com/adoptium/aqa-tests/i sun/security/rsa/TestCACerts.java https://github.com/adoptium/aqa-tests/issues/68 generic-all com/sun/crypto/provider/Mac/MacClone.java https://bugs.openjdk.java.net/browse/JDK-7087021 solaris-all javax/net/ssl/ServerName/BestEffortOnLazyConnected.java https://bugs.openjdk.org/browse/JDK-8155049 solaris-x64 +javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java https://bugs.openjdk.org/browse/JDK-8212096 solaris-x64 javax/net/ssl/Stapling/HttpsUrlConnClient.java https://github.com/adoptium/aqa-tests/issues/4150 solaris-sparcv9 javax/net/ssl/Stapling/SSLSocketWithStapling.java https://github.com/adoptium/aqa-tests/issues/4150 solaris-sparcv9 javax/net/ssl/TLSCommon/ConcurrentClientAccessTest.java https://github.com/adoptium/aqa-tests/issues/4150 solaris-sparcv9 From e3532efc4b5255c8f07e9053a9512e6e84fb5503 Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Tue, 19 Nov 2024 15:34:27 +0000 Subject: [PATCH 3/4] Include test for files existence. --- compile.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compile.sh b/compile.sh index dbe9619abd..1e5cc83a65 100755 --- a/compile.sh +++ b/compile.sh @@ -15,7 +15,7 @@ cd ./TKG $MAKE compile if [ $(uname) = SunOS ]; then - pwd - ls -ltr - chmod -R 744 ../openjdk/openjdk-jdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh* + if [ -f ../openjdk/openjdk-jdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh ]; then + chmod -R 744 ../openjdk/openjdk-jdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh + fi fi From 41397b9c84e5bfa370992d809b231262f012b010 Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Tue, 19 Nov 2024 16:51:17 +0000 Subject: [PATCH 4/4] Remove solaris permissions fix. --- compile.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/compile.sh b/compile.sh index 1e5cc83a65..d760061926 100755 --- a/compile.sh +++ b/compile.sh @@ -13,9 +13,3 @@ source ./scripts/testenv/testenvSettings.sh cd ./TKG $MAKE compile - -if [ $(uname) = SunOS ]; then - if [ -f ../openjdk/openjdk-jdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh ]; then - chmod -R 744 ../openjdk/openjdk-jdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh - fi -fi