JBR-8317 exclude vulkan package from _lb builds & calculate GLIBC expected version in checking dependencies

update exclude list on results of 21.0.6_b913.7 test runs
2026-01-10 02:21:42 +01:00 · 2025-03-08 02:27:35 +04:00 · 2025-03-08 01:10:57 +04:00
9 changed files with 43 additions and 19 deletions
--- a/jb/project/tools/common/scripts/common.sh
+++ b/jb/project/tools/common/scripts/common.sh
@@ -102,6 +102,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
--- a/jb/project/tools/linux/scripts/mkimages_aarch64.sh
+++ b/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" ] || [ "$bundle_type" == "fd" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ] || [ "$bundle_type" == "fd" ]; 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" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ] || [ "$bundle_type" == "fd" ] || [ "$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 $?
--- a/jb/project/tools/linux/scripts/mkimages_x64.sh
+++ b/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" ] || [ "$bundle_type" == "fd" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ] || [ "$bundle_type" == "fd" ]; 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" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "lb" ] || [ "$bundle_type" == "fd" ] || [ "$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 $?
--- a/jb/project/tools/linux/scripts/mkimages_x86.sh
+++ b/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=""
--- a/test/jdk/jb/build/VerifyDependencies.java
+++ b/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);
    }
--- a/test/jdk/jbA11yProblemList.txt
+++ b/test/jdk/jbA11yProblemList.txt
@@ -1,6 +1,7 @@
 java/awt/Choice/ChoiceHandleMouseEvent.java
 java/awt/Choice/ChoiceHandleMouseEvent_2.java JBR-7174 windows-all
 java/awt/Choice/SelectItem/SelectCurrentItemTest.java JBR-8333 windows-all
+java/awt/Choice/SelectItem/SelectNewItemTest.java JBR-8387 windows-x64
 java/awt/Graphics/XORPaint.java#id0 JBR-7499 windows-x64
 java/awt/Toolkit/LWCToolkitInvokeAndWaitTest.java   nobug macosx-all,linux-all,windows-all
 java/awt/Toolkit/AWTThreadingTest.java              nobug macosx-all,linux-all,windows-all
@@ -26,6 +27,7 @@ javax/swing/JComboBox/6559152/bug6559152.java JBR-5397,JBR-7382 macosx-all,windo
 javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java JBR-5210 windows-all
 javax/swing/JComboBox/bug4996503.java JBR-7412 windows-x64
 javax/swing/JComboBox/EditableComboBoxPopupPos.java JBR-7383 windows-x64
+javax/swing/JComponent/7154030/bug7154030.java JBR-8384 windows-x64
 javax/swing/JInternalFrame/Test6505027.java         nobug macosx-all,linux-all,windows-all
 javax/swing/JMenuBar/MenuBarRTLBug.java JBR-7385 windows-x64
 javax/swing/JPopupMenu/4634626/bug4634626.java      nobug macosx-all,linux-all,windows-all
--- a/test/jdk/jbFdProblemList.txt
+++ b/test/jdk/jbFdProblemList.txt
@@ -133,7 +133,6 @@ java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java JBR-7779 linux-all
 javax/swing/JEditorPane/TestBrowserBGColor.java JBR-6697 linux-aarch64
 javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java JBR-6485 linux-all
 javax/swing/plaf/nimbus/8041642/bug8041642.java JBR-6698 linux-all
-javax/swing/UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java JBR-5952,JBR-6274 windows-all,macosx-all

 jb/java/awt/Focus/PopupIncomingFocusTest.java JBR-2651 generic-all
 jb/java/awt/Window/UndecoratedDialogInTransientsChain.java JBR-6924 windows-all
--- a/test/jdk/jbProblemList.txt
+++ b/test/jdk/jbProblemList.txt
@@ -155,9 +155,10 @@ java/awt/Frame/7024749/bug7024749.java JBR-5210 windows-all
 java/awt/Frame/8158918/SetExtendedState.java JBR-6408 linux-all
 java/awt/Frame/GetGraphicsStressTest/GetGraphicsStressTest.java JBR-6509 generic-all
 java/awt/Frame/HideMaximized/HideMaximized.java JBR-8310 linux-all
-java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java 8022302 generic-all
+java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java 8296972 macosx-all
 java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java JBR-7786,JBR-7947 linux-all,macosx-15.3,macosx-15.3.1
 java/awt/Frame/MaximizedToOppositeScreen/MaximizedToOppositeScreenBig.java JBR-5303 windows-all
+java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java 8022302 generic-all
 java/awt/Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java 8286840 linux-all
 java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java JBR-4880,JBR-6683 windows-all,linux-all
 java/awt/dnd/DragTriggerEventTest.java 8320083,JBR-6548 windows-all,linux-all
@@ -549,7 +550,7 @@ java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java 8198665,8253184,JBR-831
 java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java 8198665,8253184,JBR-5510 macosx-all,windows-all,linux-5.18.2-arch1-1
 java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java 8198665,8253184 macosx-all,windows-all
 java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java 8177326,8253184,JBR-6305 macosx-all,windows-all,linux-all
-java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8253184 windows-all
+java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8253184,8298823 windows-all,macosx-all
 java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java 8253184,JBR-5811 windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java 8005021,8253184 macosx-all,windows-all
 java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java 8051455 macosx-all
--- a/test/jdk/jbScale2ProblemList.txt
+++ b/test/jdk/jbScale2ProblemList.txt
@@ -113,7 +113,6 @@ java/awt/hidpi/DrawOnFrameGraphicsTest.java nobug generic-all
 java/awt/hidpi/SetMaximizedBoundsTest.java nobug generic-all
 java/awt/hidpi/properties/HiDPIPropertiesUnixTest.java nobug generic-all
 java/awt/hidpi/properties/HiDPIPropertiesWindowsTest.java nobug generic-all
-java/awt/image/DrawImage/BlitRotateClippedArea.java nobug generic-all
 java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java nobug generic-all
 java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java nobug generic-all
 java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java nobug generic-all
@@ -143,7 +142,6 @@ javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java nobug generic
 javax/swing/JLabel/GetSpanHiDpiBug.java nobug generic-all
 javax/swing/JTabbedPane/TestBackgroundScrollPolicy.java nobug generic-all
 javax/swing/JTextArea/8149849/DNDTextToScaledArea.java nobug generic-all
-javax/swing/JTextArea/JTextAreaWordWrapTest.java nobug generic-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java nobug generic-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java 8253184,nobug,JBR-7404 windows-all,generic-all,macosx-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java nobug generic-all
@@ -160,7 +158,6 @@ javax/swing/plaf/motif/8165485/MotifHiDPIIconsTest.java nobug generic-all
 javax/swing/plaf/nimbus/TestNimbusBGColor.java nobug generic-all
 javax/swing/plaf/synth/7158712/bug7158712.java nobug generic-all
 javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java nobug generic-all
-javax/swing/plaf/synth/TitledBorderLabel.java nobug generic-all
 javax/swing/plaf/windows/8165594/WindowsClassicHiDPIIconsTest.java nobug generic-all
 javax/swing/text/CSSBorder/6796710/bug6796710.java nobug generic-all
 javax/swing/text/Caret/TestCaretPosition.java nobug generic-all
@@ -196,7 +193,6 @@ jb/javax/swing/Popup/WLPopupMoves.java nobug generic-all
 jb/javax/swing/Popup/WLPopupNoSize.java nobug generic-all
 jb/javax/swing/Popup/WLPopupResize.java nobug generic-all
 jb/javax/swing/Popup/WLPopupVisibility.java nobug generic-all
-jb/testhelpers/TitleBar/TestUtils.java nobug generic-all
 sun/java2d/SunGraphics2D/DrawImageBilinear.java nobug generic-all
 sun/java2d/pipe/InterpolationQualityTest.java nobug generic-all
Author	SHA1	Message	Date
Vitaly Provodin	817bdddeae	JBR-8317 exclude vulkan package from _lb builds & calculate GLIBC expected version in checking dependencies	2025-03-08 02:27:35 +04:00
Vitaly Provodin	f3c1c6ae5b	update exclude list on results of 21.0.6_b913.7 test runs	2025-03-08 01:10:57 +04:00