Skip to content

Commit

Permalink
(V1.0.0-release ) cherry pick (#4959)
Browse files Browse the repository at this point in the history 
* Use all cores for jtreg instead of halving (#4933)

Signed-off-by: Stewart X Addison <[email protected]>

* Enable headless mode on RISC-V (#4935)

* Exclude java/lang/StringBuilder/HugeCapacity.java on OpenJ9 zlinux (#4940)

It's already excluded on jdk17+ for other reasons.

Issue eclipse-openj9/openj9#17323

Signed-off-by: Peter Shipton <[email protected]>

* Move custom targets to special level (#4941)

Signed-off-by: Shelley Lambert <[email protected]>

* Add 21 and 22 as supported versions in external tests (#4950)

related: #4949

Signed-off-by: Lan Xia <[email protected]>

* cherry-pick

e37ba10 c5e7de8 0d7c837 76695ca 37b48e3 a45c03c

Signed-off-by: Sophia Guo <[email protected]>

---------

Signed-off-by: Stewart X Addison <[email protected]>
Signed-off-by: Peter Shipton <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Lan Xia <[email protected]>
Signed-off-by: Sophia Guo <[email protected]>
Co-authored-by: Stewart X Addison <[email protected]>
Co-authored-by: Ludovic Henry <[email protected]>
Co-authored-by: Peter Shipton <[email protected]>
Co-authored-by: Shelley Lambert <[email protected]>
Co-authored-by: Lan Xia <[email protected]>
  • Loading branch information
@sophia-guo @sxa
@luhenry @pshipton @smlambert @llxia
6 people authored Jan 11, 2024
1 parent 00bb551 commit 626eb0d
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 118 deletions.
2 changes: 1 addition & 1 deletion external/common_functions.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#

# Supported versions
supported_versions="8 11 17"
supported_versions="8 11 17 21 22"

# Supported JVMs
supported_jvms="hotspot openj9"
Expand Down
11 changes: 1 addition & 10 deletions openjdk/excludes/ProblemList_openjdk11-openj9.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ java/lang/String/CaseConvertSameInstance.java https://github.com/eclipse-openj9/
java/lang/String/CaseInsensitiveComparator.java https://github.com/eclipse-openj9/openj9/issues/6665 generic-all
java/lang/String/CompactString/IndexOf.java https://github.com/eclipse-openj9/openj9/issues/6673 generic-all
java/lang/String/EqualsIgnoreCase.java https://github.com/eclipse-openj9/openj9/issues/6666 generic-all
java/lang/StringBuilder/HugeCapacity.java https://github.com/eclipse-openj9/openj9/issues/17323 linux-s390x
java/lang/System/Logger/custom/CustomLoggerTest.java https://github.com/eclipse-openj9/openj9/issues/6674 generic-all
java/lang/System/Logger/default/DefaultLoggerTest.java https://github.com/eclipse-openj9/openj9/issues/6674 generic-all
java/lang/System/LoggerFinder/BaseLoggerFinderTest/BaseLoggerFinderTest.java https://github.com/eclipse-openj9/openj9/issues/6674 generic-all
Expand Down Expand Up @@ -306,16 +307,6 @@ sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java https://gith

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all


############################################################################

# jdk_sound
Expand Down
9 changes: 0 additions & 9 deletions openjdk/excludes/ProblemList_openjdk11.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,6 @@ sun/security/pkcs11/Secmod/AddTrustedCert.java https://github.com/adoptium/aqa-t

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

############################################################################

# jdk_sound
Expand Down
11 changes: 2 additions & 9 deletions openjdk/excludes/ProblemList_openjdk17-openj9.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@


############################################################################
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -337,15 +339,6 @@ sun/security/krb5/auto/NoAddresses.java https://github.com/adoptium/aqa-tests/is

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

######################################################################################################

# jdk_sound
Expand Down
9 changes: 0 additions & 9 deletions openjdk/excludes/ProblemList_openjdk17.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,6 @@ sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java https://github.com/adoptium/aq

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

########################################################################################################################################################

# jdk_sound
Expand Down
14 changes: 0 additions & 14 deletions openjdk/excludes/ProblemList_openjdk21-openj9.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,6 @@ java/security/SecureRandom/ApiTest.java https://github.com/eclipse-openj9/openj9
java/security/SecureRandom/EnoughSeedTest.java https://github.com/eclipse-openj9/openj9/issues/16734 windows-all
java/security/Signature/ResetAfterException.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all
java/security/Signature/SignatureLength.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

############################################################################

Expand Down Expand Up @@ -402,16 +398,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/eclipse-openj9/openj9/is

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

########################################################################################################################################################

# jdk_sound
Expand Down
10 changes: 0 additions & 10 deletions openjdk/excludes/ProblemList_openjdk21.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,16 +283,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/adoptium/aqa-tests/issue

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

############################################################################

# jdk_sound
Expand Down
13 changes: 0 additions & 13 deletions openjdk/excludes/ProblemList_openjdk22-openj9.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,6 @@ java/security/SecureRandom/ApiTest.java https://github.com/eclipse-openj9/openj9
java/security/SecureRandom/EnoughSeedTest.java https://github.com/eclipse-openj9/openj9/issues/16734 windows-all
java/security/Signature/ResetAfterException.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all
java/security/Signature/SignatureLength.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

############################################################################

Expand Down Expand Up @@ -403,15 +399,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/eclipse-openj9/openj9/is

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

########################################################################################################################################################

# jdk_sound
Expand Down
11 changes: 0 additions & 11 deletions openjdk/excludes/ProblemList_openjdk22.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,6 @@ java/nio/channels/DatagramChannel/PromiscuousIPv6.java https://github.com/adopti

# jdk_security

sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java https://github.com/adoptium/aqa-tests/issues/3811 windows-x86

############################################################################

# jdk_security3
Expand All @@ -282,15 +280,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/adoptium/aqa-tests/issue

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

############################################################################

# jdk_sound
Expand Down
13 changes: 0 additions & 13 deletions openjdk/excludes/ProblemList_openjdk23-openj9.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,6 @@ java/security/SecureRandom/ApiTest.java https://github.com/eclipse-openj9/openj9
java/security/SecureRandom/EnoughSeedTest.java https://github.com/eclipse-openj9/openj9/issues/16734 windows-all
java/security/Signature/ResetAfterException.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all
java/security/Signature/SignatureLength.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

############################################################################

Expand Down Expand Up @@ -403,15 +399,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/eclipse-openj9/openj9/is

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

########################################################################################################################################################

# jdk_sound
Expand Down
9 changes: 0 additions & 9 deletions openjdk/excludes/ProblemList_openjdk23.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/adoptium/aqa-tests/issue

# jdk_security_infra

security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all

############################################################################

# jdk_sound
Expand Down
1 change: 1 addition & 0 deletions openjdk/excludes/ProblemList_openjdk8-openj9.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ java/lang/SecurityManager/CheckPackageAccess.java https://github.com/eclipse-op
java/lang/String/CaseConvertSameInstance.java https://github.com/eclipse-openj9/openj9/issues/3303 generic-all
java/lang/String/CaseInsensitiveComparator.java https://github.com/eclipse-openj9/openj9/issues/1128 generic-all
java/lang/StringBuilder/Exceptions.java https://github.com/eclipse-openj9/openj9/issues/1128 generic-all
java/lang/StringBuilder/HugeCapacity.java https://github.com/eclipse-openj9/openj9/issues/17323 linux-s390x
java/lang/StringBuilder/Supplementary.java https://github.com/eclipse-openj9/openj9/issues/5315 linux-s390x
java/lang/StringBuffer/Exceptions.java https://github.com/eclipse-openj9/openj9/issues/1128 generic-all
java/lang/StringBuffer/TestSynchronization.java https://github.com/eclipse-openj9/openj9/issues/1128 generic-all
Expand Down
Loading

0 comments on commit 626eb0d

Please sign in to comment.