Compare commits

...

3 Commits

10 changed files with 86 additions and 15 deletions

View File

@@ -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

View File

@@ -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 $?

View File

@@ -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 $?

View File

@@ -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=""

View File

@@ -1341,3 +1341,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

View File

@@ -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);
}

View File

@@ -63,6 +63,7 @@ java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemoni
java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java 8257529,JBR-5397,JBR-7780 windows-x64,macosx-all,linux-all
java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java JBR-5397,JBR-4074 macosx-all,windows-all
java/awt/List/ItemEventTest/ItemEventTest.java JBR-5397,JBR-5505 macosx-all,windows-all
java/awt/Modal/ModalDialogCannotBeMadeNonModalTest.java JBR-8510 windows-all
java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java JBR-5397,JBR-8074 macosx-all,windows-x64
java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java JBR-5397,JBR-5802 macosx-all,windows-all
java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java JBR-6948 windows-x64

View File

@@ -121,6 +121,7 @@ java/awt/Focus/8013611/JDK8013611.java JBR-7338,JBR-7506 linux-all,windows-all
java/awt/Focus/8073453/SwingFocusTransitionTest.java JBR-7339 linux-all,windows-all
java/awt/Focus/8282640/ScrollPaneFocusBugTest.java JBR-7340 linux-all
java/awt/Focus/ChoiceFocus/ChoiceFocus.java JBR-7341 linux-all
java/awt/Focus/ModalDialogInFocusEventTest.java JBR-7818 linux-all
java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java JBR-8233 linux-x64
java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java JBR-5210,JBR-7077 windows-all,linux-all
java/awt/List/PageUPSelectsItemsTest.java JBR-8281 linux-all

View File

@@ -759,12 +759,14 @@ java/foreign/TestMismatch.java 8249684 macosx-all
# jdk_lang
java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java JBR-8453 generic-all
java/lang/ProcessBuilder/Basic.java#id0 JBR-8504,JBR-8505 windows-all,windows-aarch64
java/lang/ProcessHandle/InfoTest.java 8211847 aix-ppc64
java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java 8151492 generic-all
java/lang/invoke/LFCaching/LFGarbageCollectedTest.java 8078602 generic-all
java/lang/invoke/lambda/LambdaFileEncodingSerialization.java 8249079 linux-x64
java/lang/invoke/PrivateInvokeTest.java JBR-8454 generic-all
java/lang/invoke/RicochetTest.java 8251969 generic-all
java/lang/Thread/virtual/stress/PingPong.java#ltq JBR-8509 windows-aarch64
############################################################################
@@ -777,6 +779,7 @@ java/lang/instrument/RetransformBigClass.sh 8065756 generic-
# jdk_io
java/io/File/GetXSpace.java JBR-8499 windows-all
java/io/pathNames/GeneralWin32.java 8180264 windows-all
java/io/Serializable/font/FontSerialization.java JBR-8452 macosx-all,windows-all
@@ -795,6 +798,10 @@ sun/management/jdp/JdpDefaultsTest.java 8241865 linux-aa
sun/management/jdp/JdpJmxRemoteDynamicPortTest.java 8241865 macosx-all
sun/management/jdp/JdpSpecificAddressTest.java 8241865 macosx-all
sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id0 JBR-8507 windows-all
sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 JBR-8507 windows-all
sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java JBR-8507 windows-all
############################################################################
# jdk_jmx
@@ -894,6 +901,8 @@ security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#sslrootevrsaca 8333788 generic-all
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1 8328825 generic-all
sun/security/mscapi/CngCipher.java JBR-8508 windows-all
sun/security/smartcardio/TestChannel.java 8039280 generic-all
sun/security/smartcardio/TestConnect.java 8039280 generic-all
sun/security/smartcardio/TestConnectAgain.java 8039280 generic-all
@@ -916,6 +925,8 @@ sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 gene
sun/security/provider/PolicyParser/ExtDirsChange.java 8039280 generic-all
sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
sun/security/tools/jarsigner/TimestampCheck.java 8352302 generic-all
############################################################################
# jdk_sound
@@ -941,6 +952,12 @@ javax/sound/sampled/Clip/ClipIsRunningAfterStop.java 8307574,JBR-4455 linux-x64,
javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh JBR-5363 windows-all
# jdk_script
############################################################################
javax/script/ScriptEngineOrder.sh JBR-8506 windows-all
# jdk_swing
javax/accessibility/SlowPanelIteration/SlowPanelIteration.java JBR-870 windows-x64,linux-x64
@@ -1065,7 +1082,7 @@ javax/swing/JSplitPane/4885629/bug4885629.java JBR-5510 linux-5.18.2-arch1-1
javax/swing/JTabbedPane/4361477/bug4361477.java JBR-5932 linux-all
javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all
javax/swing/JTabbedPane/4624207/bug4624207.java 8064922,8197552,JBR-6235 macosx-all,windows-all,linux-all 8064922:macosx-all, 8197552:windows-all
javax/swing/JTabbedPane/TestBackgroundScrollPolicy.java 8253184 windows-all
javax/swing/JTabbedPane/TestBackgroundScrollPolicy.java 8253184,JBR-8498 windows-all,linux-5.18.2-arch1-1
javax/swing/JToggleButton/TestSelectedKey.java JBR-5846 windows-all
javax/swing/JToolBar/4529206/bug4529206.java JBR-5387 linux-all
javax/swing/JToolTip/6219960/bug6219960.java 8253184 windows-all
@@ -1164,6 +1181,7 @@ tools/jlink/JLinkReproducible3Test.java 8253688 linux-aa
tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java JBR-8465 generic-all
tools/launcher/Arrrghs.java JBR-8466 generic-all
tools/launcher/ChangeDataModel.java JBR-8467 generic-all
tools/launcher/MultipleJRERemoved.java JBR-8468 generic-all
tools/launcher/Settings.java JBR-8469 macosx-all
############################################################################
@@ -1229,7 +1247,7 @@ jdk/jfr/api/consumer/streaming/TestJVMExit.java JBR-8460 macosx-15.3,macosx-15.3
# jdk_internal
jdk/internal/jimage/JImageOpenTest.java JBR-8453
jdk/internal/jimage/JImageOpenTest.java JBR-8453,JBR-8501 generic-all,windows-all
jdk/internal/platform/docker/TestDockerBasic.java JBR-5220 linux-aarch64
jdk/internal/platform/docker/TestDockerMemoryMetrics.java JBR-5220 linux-aarch64
@@ -1244,6 +1262,7 @@ jdk/internal/platform/docker/TestPidsLimit.java 8311539 linux-all
# jdk_modules
jdk/modules/etc/JdkQualifiedExportTest.java JBR-4135 generic-all
jdk/modules/etc/UpgradeableModules.java JBR-8464 generic-all
############################################################################

View File

@@ -33,7 +33,7 @@ java/awt/Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java 8286840 linu
java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java JBR-6090 windows-all
java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java JBR-8415 windows-10.0
java/awt/Frame/WindowDragTest/WindowDragTest.java JBR-6090 windows-x64
java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java 8238720,8324782,JBR-6090,JBR-4199 windows-all,macosx-all,linux-6.8.0-54-generic,linux-6.8.0-1021-aws,6.8.0-1024-aws
java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java 8238720,8324782,JBR-4199 windows-all,macosx-all,linux-all
java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java 8238720,8324782,JBR-6090,JBR-4199 windows-all,macosx-all,linux-6.8.0-54-generic,linux-6.8.0-1021-aws,linux-6.8.0-1024-aws
java/awt/Graphics/LineClipTest.java JBR-5071 linux-all