update exclude list on results of 21.0.1_b310.2 test runs

This reverts commit be6842220b.

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

@@ -77,7 +77,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi

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

@@ -77,7 +77,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi

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

@@ -65,7 +65,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi

jb/project/tools/mac/scripts/mkimages.sh

@@ -72,7 +72,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
     mv release $JRE_CONTENTS/Home/release
     cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
-    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/server/*.jsa $JRE_CONTENTS/Home/lib/server
     copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
   fi
@@ -88,7 +87,7 @@ function create_image_bundle {
 
   echo Creating "$JBR".tar.gz ...
   # Normalize timestamp
-  #find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
+  find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
 
   (cd "$tmp" &&
       find "$__root_dir" -print0 | LC_ALL=C sort -z | \

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

@@ -75,7 +75,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release
     cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
     for dir in $(ls -d $IMAGES_DIR/jdk/*); do
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done

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

@@ -66,7 +66,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release
     cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
     for dir in $(ls -d $IMAGES_DIR/jdk/*); do
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done

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

@@ -62,7 +62,6 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release
     cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
     for dir in $(ls -d $IMAGES_DIR/jdk/*); do
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done

test/jdk/jb/build/CDSArchivesTest.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# @test
-# @summary CDSArchivesTest.sh checks jsa files exist in jbrsdk distributions, jbr distributions are skipped
-# @run shell CDSArchivesTest.sh
-
-if [ -z "${TESTJAVA}" ]; then
-  echo "TESTJAVA undefined: testing cancelled"
-  exit 1
-fi
-
-source ${TESTJAVA}/release
-echo "Checking $IMPLEMENTOR_VERSION"
-if [[ "$IMPLEMENTOR_VERSION" != *"JBRSDK"* ]]; then
-  echo "Test executed for JBRSDK only"
-  echo "skipping the test"
-  exit 0
-fi
-
-FIND="/usr/bin/find"
-files=$(${FIND} ${TESTJAVA} -name "*.jsa")
-ls -l $files
-if [ $? != 0 ]; then
-    echo "Command failed."
-    exit 1
-elif [ -z "$files" ]; then
-    echo "*** FAILED *** jsa-files not found"
-    echo "\n*** FAILED *** Test failed"
-    exit 1
-fi
-echo "\nTest passed"

test/jdk/jb/javax/swing/JLabel/JLabel/JLabel269.java

@@ -25,11 +25,13 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import javax.swing.BoxLayout;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import javax.swing.plaf.FontUIResource;
 
 /* @test
@@ -54,8 +56,7 @@ public class JLabel269 {
         }
     }
 
-    public static void main(String[] args) {
-
+    public static void main(String[] args) throws InterruptedException, InvocationTargetException {
         String labelText = "<html><body><code>A</code></body></html>";
 
         verbose = Arrays.asList(args).contains("-verbose");
@@ -63,23 +64,27 @@ public class JLabel269 {
         JFrame mainFrame = new JFrame();
 
         JPanel container = new JPanel();
-        container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS));
 
         JPanel p1 = new JPanel();
         JLabel l1 = new JLabelTest(labelText);
-        l1.setFont(new FontUIResource("Tahoma", Font.PLAIN, 36));
-        p1.add(l1);
-        container.add(p1);
-
         JPanel p2 = new JPanel();
         JLabel l2 = new JLabelTest(labelText);
-        l2.setFont(new FontUIResource("Tahoma", Font.PLAIN, 72));
-        p2.add(l2);
-        container.add(p2);
 
-        mainFrame.add(container);
-        mainFrame.pack();
-        mainFrame.setVisible(true);
+        SwingUtilities.invokeAndWait(() -> {
+            container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS));
+
+            l1.setFont(new FontUIResource("Tahoma", Font.PLAIN, 36));
+            p1.add(l1);
+            container.add(p1);
+
+            l2.setFont(new FontUIResource("Tahoma", Font.PLAIN, 72));
+            p2.add(l2);
+            container.add(p2);
+
+            mainFrame.add(container);
+            mainFrame.pack();
+            mainFrame.setVisible(true);
+        });
 
         BufferedImage bi = new BufferedImage(
                 l1.getWidth(), l1.getHeight(), BufferedImage.TYPE_INT_ARGB);

test/jdk/jbProblemList.txt

@@ -927,6 +927,7 @@ javax/swing/JOptionPane/7138665/bug7138665.java JBR-5799 windows-all
 javax/swing/JOptionPane/8081019/bug8081019.java JBR-5767 windows-all
 javax/swing/JPopupMenu/6415145/bug6415145.java 8197552 windows-all
 javax/swing/JPopupMenu/6515446/bug6515446.java 8197552 windows-all
+javax/swing/JPopupMenu/SetInvokerJPopupMenuTest.java JBR-6021 linux-all
 javax/swing/JRadioButton/8033699/bug8033699.java 8197552 windows-all
 javax/swing/JRadioButton/8075609/bug8075609.java 8197552,8266085,JBR-5510 windows-all,linux-5.18.2-arch1-1
 javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java 8197552,8266085 windows-all