update exclude list on results of 21.0.7 test runs

jb/project/tools/common/scripts/common.sh

@@ -104,6 +104,12 @@ else
   WITH_BUNDLED_FREETYPE=""
 fi
 
+if [ "$bundle_type" == "lb" ]; then
+  WITH_VULKAN=""
+else
+  WITH_VULKAN="--with-vulkan"
+fi
+
 REPRODUCIBLE_BUILD_OPTS="--with-source-date=$SOURCE_DATE_EPOCH
   --with-hotspot-build-time=$BUILD_TIME
   --with-copyright-year=$COPYRIGHT_YEAR

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -35,7 +35,7 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
-    --with-vulkan \
+    $WITH_VULKAN \
     $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
@@ -113,6 +113,11 @@ case "$bundle_type" in
     jbr_name_postfix="_${bundle_type}"
     do_maketest=1
     ;;
+  "lb")
+    do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
+    do_maketest=1
+    ;;
   "nomod" | "")
     bundle_type=""
     ;;
@@ -141,7 +146,7 @@ JBRSDK_BUNDLE=jbrsdk
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ]; then
   git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
   update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
@@ -154,7 +159,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
 
 # create sdk image bundle
 modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
   modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -42,7 +42,7 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
-    --with-vulkan \
+    $WITH_VULKAN \
     $LINUX_TARGET \
     $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
@@ -121,6 +121,11 @@ case "$bundle_type" in
     jbr_name_postfix="_${bundle_type}"
     do_maketest=1
     ;;
+  "lb")
+    do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
+    do_maketest=1
+    ;;
   "nomod" | "")
     bundle_type=""
     ;;
@@ -149,7 +154,7 @@ JBRSDK_BUNDLE=jbrsdk
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ]; then
   git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
   update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
@@ -162,7 +167,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
 
 # create sdk image bundle
 modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ]|| [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
   modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?

jb/project/tools/linux/scripts/mkimages_x86.sh

@@ -92,7 +92,7 @@ WITH_DEBUG_LEVEL="--with-debug-level=release"
 RELEASE_NAME=linux-x86-server-release
 
 case "$bundle_type" in
-  "jcef")
+  "jcef" | "lb")
     echo "not implemented" && do_exit 1
     ;;
   "nomod" | "")
@@ -119,7 +119,7 @@ JBRSDK_BUNDLE=jbrsdk
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "lb" ]; then
   jbr_name_postfix="_${bundle_type}"
 else
   jbr_name_postfix=""

test/jdk/TEST.groups

@@ -815,6 +815,7 @@ jdk_awt_wayland = \
     -java/awt/Clipboard/LostOwnershipChainTest/SystemClipboardTest.java \
     -java/awt/ColorClass/AlphaColorTest.java \
     -java/awt/Component/7097771 \
+    -java/awt/Component/ComponentEventTest.java \
     -java/awt/Component/ComponentRedrawnTest.java \
     -java/awt/Component/DimensionEncapsulation \
     -java/awt/Component/F10TopToplevel \
@@ -945,6 +946,7 @@ jdk_awt_wayland = \
     -java/awt/Focus/InputVerifierTest3 \
     -java/awt/Focus/KeyEventForBadFocusOwnerTest \
     -java/awt/Focus/LabelScrollBarFocus.java \
+    -java/awt/MenuShortcut/ActionCommandTest.java \
     -java/awt/Focus/ModalBlockedStealsFocusTest \
     -java/awt/Focus/ModalDialogActivationTest \
     -java/awt/Focus/ModalDialogInFocusEventTest.java \
@@ -1285,6 +1287,7 @@ jdk_swing_wayland= \
     -javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java \
     -javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java \
     -javax/swing/KeyboardManager/8013370/Test8013370.java \
+    -javax/swing/KeyboardManager/bug4345798.java \
     -javax/swing/LookAndFeel/8145547/DemandGTK.java \
     -javax/swing/LookAndFeel/8146276/NimbusGlueTest.java \
     -javax/swing/LookAndFeel/SystemLookAndFeel/SystemLookAndFeelTest.java \
@@ -1340,3 +1343,27 @@ jdk_swing_wayland= \
 jdk_desktop_wayland = \
     :jdk_awt_wayland \
     :jdk_swing_wayland
+
+# tests to be executed against Legacy Binary builds
+jdk_awt_legacy_libc= \
+    :jdk_awt \
+    -jb/java/awt/wayland/VulkanMaskFillTest.java
+
+jdk_swing_legacy_libc= \
+    :jdk_swing
+
+jdk_desktop_legacy_libc = \
+    :jdk_desktop \
+    -jb/java/awt/wayland/VulkanMaskFillTest.java
+
+# Wayland tests to be executed against Legacy Binary builds with -Dawt.toolkit.name=WLToolkit
+jdk_awt_wayland_legacy_libc= \
+    :jdk_awt_wayland \
+    -jb/java/awt/wayland/VulkanMaskFillTest.java
+
+jdk_swing_wayland_legacy_libc= \
+    :jdk_swing_wayland
+
+jdk_desktop_wayland_legacy_libc = \
+    :jdk_awt_wayland_legacy_libc \
+    :jdk_swing_wayland_legacy_libc

test/jdk/jb/build/VerifyDependencies.java

@@ -30,14 +30,18 @@ import java.io.InputStreamReader;
 /**
  * @test
  * @summary VerifyDependencies checks readability verifies that a Linux shared
- *          library has no dependency on symbols from glibc version higher than 2.28
+ *          library has no dependency on symbols from glibc version higher than <code>expectedVersion</code>
  * @run main VerifyDependencies
  * @requires (os.family == "linux")
  */
 
 public class VerifyDependencies {
 
-    static final public String EXPECTED_VERSION = "2.28";
+    static final public String EXPECTED_VERSION_LEGACY = "2.17";
+    static final public String EXPECTED_VERSION_VULKAN = "2.28";
+
+    static String expectedVersion;
+
     public static void verifyLibrary(String libraryPath) throws IOException {
         Process process;
         BufferedReader reader;
@@ -52,12 +56,12 @@ public class VerifyDependencies {
             System.out.println(line);
             if (line.contains("GLIBC_")) {
                 String version = extractVersion(line);
-                if (compareVersions(version, EXPECTED_VERSION) > 0) {
+                if (compareVersions(version, expectedVersion) > 0) {
                     throw new RuntimeException(libraryPath + " has a dependency on glibc version " + version);
                 }
             }
         }
-        System.out.println(libraryPath + " has no dependency on glibc version higher than " + EXPECTED_VERSION);
+        System.out.println(libraryPath + " has no dependency on glibc version higher than " + expectedVersion);
     }
 
     private static String extractVersion(String line) {
@@ -125,6 +129,12 @@ public class VerifyDependencies {
 
     public static void main(String[] args) throws IOException {
         String javaHome = System.getProperty("java.home");
+
+        String vendorVersion = System.getProperty("java.vendor.version");
+        expectedVersion = vendorVersion.substring(Math.max(vendorVersion.length() - 3, 0)).compareTo("-lb") == 0
+                ? EXPECTED_VERSION_LEGACY : EXPECTED_VERSION_VULKAN;
+        System.out.println("supporting glibc version is not less than " + expectedVersion);
+
         findInDirectory(javaHome + "/bin", false);
         findInDirectory(javaHome + "/lib", true);
     }

test/jdk/jbProblemList.txt

@@ -1323,6 +1323,7 @@ java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java JBR-6335 linux-a
 java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java JBR-6507 linux-all
 java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java JBR-6052 macosx-all,linux-all
 java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 8258103,8253184 linux-all,windows-all
+java/awt/List/HandlingKeyEventIfMousePressedTest.java 6848358 macosx-all,windows-all
 
 com/sun/jndi/dns/ConfigTests/Timeout.java 8220213 generic-all
 
@@ -1511,7 +1512,7 @@ javax/swing/LookAndFeel/8145547/DemandGTK3.sh JBR-5510 linux-5.18.2-arch1-1
 jb/java/awt/Focus/BrokenTraversalAWT.java JBR-5799 windows-all
 jb/java/awt/Focus/ComplexFocusSequence.java JBR-6728 linux-all,windows-x64
 jb/java/awt/Focus/ContextMenuAfterPopup.java JBR-5799 windows-all
-jb/java/awt/Focus/FileDialogClosing.java JBR-8309 macosx-x64
+jb/java/awt/Focus/FileDialogClosing.java JBR-8309 macosx-x64,windows-all
 jb/java/awt/Focus/FocusTraversalOrderTest.java JBR-6060 generic-all
 jb/java/awt/Focus/PopupIncomingFocusTest.java JBR-5799 windows-all
 jb/java/awt/Focus/TitleBarClickTest.java JBR-6394 linux-5.18.2-arch1-1,windows-all

test/jdk/jbScale2ProblemList.txt

@@ -202,7 +202,7 @@ sun/java2d/pipe/InterpolationQualityTest.java nobug generic-all
 java/awt/event/ComponentEvent/TextComponentTextEventTest.java JBR-6287 windows-all
 
 jb/java/awt/Focus/ComplexFocusSequence.java JBR-6728 linux-all,windows-x64
-jb/java/awt/Focus/FileDialogClosing.java JBR-5799 windows-all
+jb/java/awt/Focus/FileDialogClosing.java JBR-8309,JBR-5799 macosx-x64,windows-all
 jb/java/awt/Focus/ModalDialogFromMenuTest.java JBR-5799 windows-all
 jb/java/awt/Focus/ModalDialogOverSiblingTest.java                                   JBR-5716 windows-all
 jb/java/awt/Focus/PopupFromMenuTest.java JBR-5799 windows-all

test/jdk/jbWaylandProblemList.txt

@@ -1,5 +1,6 @@
 java/awt/font/ComplexEmoji.java JBR-5009,JBR-8399 linux-aarch64,linux-x64
 java/awt/FullScreen/SetFullScreenTest.java JBR-8214,JBR-8400 linux-5.18.2-arch1-1,linux-x64
+java/awt/MenuShortcut/FunctionKeyShortcut.java JBR-7932 linux-all
 java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java JBR-8264 linux-x64
 
 java/awt/event/KeyEvent/FunctionKeyTest.java JBR-7773 linux-all