Skip to content

Commit

Permalink
Commenting and consolidating duplicate entries in exclude files
Browse files Browse the repository at this point in the history
When a test appears in an exclude file multiple times, the platforms
in the final instance override the platforms in the other iunstances.

However, as the exclude files are not always kept alphabetical,
duplicate entries can be overlooked when excluding tests.

I have identified, consolidated, and commented out the duplicate
test entries that I can see, and I've posted a message in the
testing-aqavit Slack channel to advise people of the situation, and
how they can avoid it in the future.

Signed-off-by: Adam Farley <adfarley@redhat.com>
  • Loading branch information
adamfarley committed Jun 29, 2023
1 parent b42c758 commit 4f0a0aa
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 78 deletions.
13 changes: 7 additions & 6 deletions openjdk/excludes/ProblemList_openjdk11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ compiler/aot/verification/vmflags/NotTrackedFlagTest.java 8215224 generic-all
# jdk_lang

java/lang/Class/GetPackageBootLoaderChildLayer.java https://github.com/adoptium/aqa-tests/issues/1267 macosx-all
java/lang/ProcessBuilder/checkHandles/CheckHandles.java https://github.com/adoptium/aqa-tests/issues/1773 windows-x86
#java/lang/ProcessBuilder/checkHandles/CheckHandles.java https://github.com/adoptium/aqa-tests/issues/1773 windows-x86
java/lang/ProcessBuilder/checkHandles/CheckHandles.java https://github.com/adoptium/aqa-tests/issues/1920 windows-all
# java/lang/String/StringRepeat.java https://bugs.openjdk.java.net/browse/JDK-8221400
java/lang/String/StringRepeat.java#id1 https://github.com/adoptium/aqa-tests/issues/1272 windows-all
java/lang/ProcessBuilder/Basic.java#id0 https://github.com/adoptium/aqa-tests/issues/4155 windows-aarch64
#java/lang/ProcessBuilder/Basic.java is excluded for issue on alpine linux. As currently there is no way to exclude tests for alpine specifically, using linux-all instead
#java/lang/ProcessBuilder/Basic.java#id0 https://bugs.openjdk.org/browse/JDK-8245748 linux-all
java/lang/ProcessBuilder/Basic.java#id0 https://github.com/adoptium/aqa-tests/issues/4155 windows-aarch64,linux-all
java/lang/ProcessBuilder/Basic.java#id1 https://bugs.openjdk.org/browse/JDK-8245748 linux-all
java/lang/System/LoggerFinder/modules/JDKLoggerForImageTest.java https://github.com/adoptium/aqa-tests/issues/1267 macosx-all
java/lang/System/LoggerFinder/modules/LoggerInImageTest.java https://github.com/adoptium/aqa-tests/issues/1267 macosx-all
java/lang/System/LoggerFinder/modules/NamedLoggerForImageTest.java https://github.com/adoptium/aqa-tests/issues/1267 macosx-all
Expand All @@ -70,9 +74,7 @@ java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java https://gi
java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java https://github.com/adoptium/infrastructure/issues/1118 linux-aarch64
jdk/modules/etc/DefaultModules.java https://github.com/adoptium/aqa-tests/issues/1267 macosx-all
jdk/modules/incubator/ImageModules.java https://github.com/adoptium/aqa-tests/issues/1267 macosx-all
#java/lang/ProcessBuilder/Basic.java is excluded for issue on alpine linux. As currently there is no way to exclude tests for alpine specifically, using linux-all instead
java/lang/ProcessBuilder/Basic.java#id0 https://bugs.openjdk.org/browse/JDK-8245748 linux-all
java/lang/ProcessBuilder/Basic.java#id1 https://bugs.openjdk.org/browse/JDK-8245748 linux-all

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

# jdk_management
Expand Down Expand Up @@ -133,7 +135,6 @@ java/net/ipv6tests/B6521014.java https://github.com/adoptium/aqa-tests/issues/15
sun/net/www/protocol/file/DirPermissionDenied.java https://github.com/adoptium/aqa-tests/issues/760 windows-all
sun/net/www/http/KeepAliveCache/KeepAliveProperty.java https://bugs.openjdk.org/browse/JDK-8285836 linux-ppc64le
com/sun/net/httpserver/bugs/B6361557.java https://github.com/adoptium/aqa-tests/issues/1272 windows-all
java/lang/ProcessBuilder/checkHandles/CheckHandles.java https://github.com/adoptium/aqa-tests/issues/1920 windows-all
java/net/ipv6tests/UdpTest.java https://bugs.openjdk.java.net/browse/JDK-8198266 generic-all
############################################################################

Expand Down
4 changes: 2 additions & 2 deletions openjdk/excludes/ProblemList_openjdk17.txt
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,13 @@ java/util/zip/DeInflate.java https://bugs.openjdk.org/browse/JDK-8299748 linux-s
# jdk_foreign
java/foreign/valist/VaListTest.java https://bugs.openjdk.org/browse/JDK-8295290 windows-aarch64
java/foreign/malloc/TestMixedMallocFree.java https://bugs.openjdk.org/browse/JDK-8295290 windows-aarch64
java/foreign/TestNative.java https://bugs.openjdk.org/browse/JDK-8295290 windows-aarch64
#java/foreign/TestNative.java https://bugs.openjdk.org/browse/JDK-8295290 windows-aarch64
java/foreign/TestNative.java https://github.com/adoptium/aqa-tests/issues/1920 generic-all
java/foreign/TestVarArgs.java https://bugs.openjdk.org/browse/JDK-8295290 windows-aarch64
java/foreign/StdLibTest.java https://bugs.openjdk.org/browse/JDK-8295290 windows-aarch64
java/foreign/TestArrays.java https://github.com/adoptium/aqa-tests/issues/1701 generic-all
java/foreign/TestLayouts.java https://github.com/adoptium/aqa-tests/issues/1701 generic-all
java/foreign/TestLayoutPaths.java https://github.com/adoptium/aqa-tests/issues/1701 generic-all
java/foreign/TestNative.java https://github.com/adoptium/aqa-tests/issues/1920 generic-all

############################################################################
# jvm_compiler
Expand Down
Loading

0 comments on commit 4f0a0aa

Please sign in to comment.