updated JTreg exclude list

Move GB18030.class from sun/nio/cs/ext (jdk.charsets) to sun/nio/cs (java.base),
so the charset is available during VM initialization on Windows.

make/data/charsetmapping/stdcs-windows

@@ -2,6 +2,7 @@
 #   generate these charsets into sun.nio.cs
 #
 GBK
+GB18030
 Johab
 MS1255
 MS1256

src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java

@@ -233,7 +233,6 @@ public class LWWindowPeer
 
         setOpaque(getTarget().isOpaque());
 
-        updateInsets(platformWindow.getInsets());
         if (getSurfaceData() == null) {
             replaceSurfaceData(false);
         }
@@ -310,6 +309,7 @@ public class LWWindowPeer
                 }
             }
         }
+        updateInsets(platformWindow.getInsets());
     }
 
     @Override

src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m

@@ -163,7 +163,7 @@ JNF_COCOA_ENTER(env);
     const CTFontRef fallback = CTS_CopyCTFallbackFontAndGlyphForJavaGlyphCode(awtFont, glyphCode, &glyph);
     const CGFontRef cgFallback = CTFontCopyGraphicsFont(fallback, NULL);
     if (IS_OSX_GT10_14 || CGGI_IsColorFont(cgFallback)) {
-        CGAffineTransform matrix = CGAffineTransformConcat(awtStrike->fAltTx, awtStrike->fFontTx);
+        CGAffineTransform matrix = awtStrike->fAltTx;
         CGFloat fontSize = sqrt(fabs(matrix.a * matrix.d - matrix.b * matrix.c));
         CTFontRef font = CTFontCreateWithGraphicsFont(cgFallback, fontSize, NULL, NULL);
         CTFontGetAdvancesForGlyphs(font, kCTFontDefaultOrientation, &glyph, &advance, 1);

src/java.desktop/share/classes/java/awt/Component.java

@@ -7214,6 +7214,13 @@ public abstract class Component implements ImageObserver, MenuContainer,
                                         : 0));
                 dispatchEvent(e);
             }
+
+            Window window = getContainingWindow();
+            // window is supposed to be not a null value (addNotify)
+            Component mostRecentFocusOwner = KeyboardFocusManager.getMostRecentFocusOwner(window);
+            if (mostRecentFocusOwner != this) {
+                requestFocusInWindow();
+            }
         }
     }
 

src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java

@@ -51,17 +51,25 @@ class FreetypeFontScaler extends FontScaler {
            and therefore no need to load it explicitly here */
         FontManagerNativeLibrary.load();
 
-        String jreFontConfName = java.security.AccessController.doPrivileged(
-                (PrivilegedAction<String>) () ->
-                        "true".equals(System.getProperty(
-                                "java2d.font.loadFontConf", "")) ?
-                                System.getProperty("java.home", "") +
-                                File.separator + "lib" + File.separator +
-                                "fonts" + File.separator + "font.conf" :
-                                null);
+        String fontConfName = java.security.AccessController.doPrivileged(
+                (PrivilegedAction<String>) () -> {
+                    if ("true".equals(System.getProperty(
+                            "java2d.font.loadFontConf", ""))) {
+                        File f = new File(System.getProperty("user.home", "") +
+                                          File.separator + ".fonts.conf");
+
+                        if (!f.exists()) {
+                            f = new File(System.getProperty("java.home", "") +
+                                         File.separator + "lib" + File.separator +
+                                         "fonts" + File.separator + "font.conf");
+                        }
+                        return f.getAbsolutePath();
+                    }
+                    return null;
+                });
 
         initIDs(FreetypeFontScaler.class, Toolkit.class, PhysicalFont.class,
-                jreFontConfName);
+                fontConfName);
     }
 
     private static native void initIDs(Class<?> FFS, Class<?> toolkitClass, Class<?> pfClass,

src/java.desktop/share/classes/sun/swing/SwingUtilities2.java

@@ -1252,8 +1252,7 @@ public class SwingUtilities2 {
 
             GraphicsConfiguration gc = c.getGraphicsConfiguration();
             AffineTransform tx = (gc == null) ? null : gc.getDefaultTransform();
-            // [tav] workaround deadlock on MacOSX until fixed, JRE-226
-            if (!FontUtilities.isMacOSX && tx == null && !GraphicsEnvironment.isHeadless()) {
+            if (tx == null && !GraphicsEnvironment.isHeadless()) {
                 tx =  GraphicsEnvironment
                         .getLocalGraphicsEnvironment()
                         .getDefaultScreenDevice()

src/java.desktop/share/native/libfontmanager/freetypeScaler.c

@@ -260,7 +260,7 @@ Java_sun_font_FreetypeFontScaler_initIDs(
         fcConfig = (*FcInitLoadConfigAndFontsPtr)();
         if (fcConfig != NULL && fontConf != NULL) {
             result = (*FcConfigParseAndLoadPtr)(fcConfig, (const FcChar8 *) fontConf, FcFalse);
-            if (logFC) fprintf(stderr, "FC_LOG: FcConfigParseAndLoad %d \n", result);
+            if (logFC) fprintf(stderr, "FC_LOG: FcConfigParseAndLoad(\"%s\") %d \n", fontConf,  result);
             result = (*FcConfigSetCurrentPtr)(fcConfig);
             if (logFC) fprintf(stderr, "FC_LOG: FcConfigSetCurrent %d \n", result);
         }

test/hotspot/jtreg/jbProblemList.txt

@@ -38,7 +38,7 @@
 #
 #############################################################################
 
-applications/jcstress/acqrel/Test.java generic-all
+applications/jcstress/acqrel/Test.java - generic-all
 
 # :hotspot_compiler
 
@@ -47,6 +47,7 @@ compiler/codecache/stress/OverloadCompileQueueTest.java
 compiler/codegen/Test6896617.java                                                   8193479 generic-all
 compiler/codegen/aes/TestCipherBlockChainingEncrypt.java                            8219513 generic-all
 compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java                     8140405 generic-all
+compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java                  8209459 linux-aarch64
 compiler/jsr292/ContinuousCallSiteTargetChange.java                                 8222030 generic-all
 compiler/jvmci/compilerToVM/GetFlagValueTest.java                                   8204459 generic-all
 compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java                            8158860 generic-all
@@ -56,6 +57,7 @@ compiler/types/correctness/CorrectnessTest.java
 compiler/types/correctness/OffTest.java                                             8066173 generic-all
 
 compiler/c2/Test6852078.java                                                        8194310 generic-all
+compiler/c2/Test6857159.java                                                        8234290 generic-all
 
 applications/ctw/modules/java_desktop.java 8189604 windows-all
 applications/ctw/modules/java_desktop_2.java 8189604,8204842 generic-all
@@ -89,6 +91,8 @@ runtime/SelectionResolution/InvokeVirtualSuccessTest.java
 runtime/SharedArchiveFile/SASymbolTableTest.java                                    8193639 solaris-all
 vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java                 8013728 generic-all
 runtime/memory/ReadFromNoaccessArea.java                                            nobug   generic-all crash is the expected behaviour
+runtime/modules/ModuleStress/ExportModuleStressTest.java                            8230055 windows-all
+runtime/modules/ModuleStress/ModuleStressGC.java                                    8230055 windows-all
 
 #############################################################################
 
@@ -205,29 +209,33 @@ vmTestbase/nsk/jvmti/IterateThroughHeap/filter-untagged/TestDescription.java
 
 vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java                       JRE-1282 macosx-10.13
 
-vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8208243,8192647 generic-all
+vmTestbase/gc/lock/jni/jnilock002/TestDescription.java                              8208243,8192647 generic-all
 
-vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java 8148743 generic-all
-vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java 8208259 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java         8148743 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java         8208259 generic-all
 
-vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSite/Test.java 8079664 generic-all
-vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSite/Test.java 8079664 generic-all
-vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java 8208257,8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java 8079642,8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/gc/callSequencesDuringGC/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/java/sequences/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java 8208255 generic-all
-vmTestbase/vm/mlvm/mixed/stress/java/findDeadlock/TestDescription.java 8208278 generic-all
-vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8079650 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java    8013267 generic-all
+vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSite/Test.java                 8079664 generic-all
+vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSite/Test.java                8079664 generic-all
+vmTestbase/vm/mlvm/cp/stress/classfmt/correctBootstrap/TestDescription.java         8231169 linux-aarch64
+vmTestbase/vm/mlvm/cp/stress/classfmt/mh/TestDescription.java                       8231169 linux-aarch64
+vmTestbase/vm/mlvm/meth/stress/gc/createLotsOfMHConsts/Test.java                    8231169 linux-aarch64
+vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java                          8208255 generic-all
+vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java                   8208257,8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java                        8079642,8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java                           8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java                         8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/gc/callSequencesDuringGC/Test.java                   8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/java/sequences/Test.java                             8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java               8208255 generic-all
+vmTestbase/vm/mlvm/mixed/stress/java/findDeadlock/TestDescription.java              8208278 generic-all
+vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java                8079650 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java         8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java     8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java     8013267 generic-all
 
-vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java 8197938 windows-all
+vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java                               8197938 windows-all
+vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java.unwatch002                    8208471 windows-all
 
 vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all
 

test/jdk/jb/sun/awt/macos/KeyboardLayoutSwitchTest/KeyboardLayoutSwitchTest.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+public class KeyboardLayoutSwitchTest implements Runnable {
+
+    private static Robot robot;
+    private JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+
+        System.out.println("VK_TAB = " + KeyEvent.VK_TAB);
+        robot = new Robot();
+        robot.setAutoDelay(50);
+
+        KeyboardLayoutSwitchTest test = new KeyboardLayoutSwitchTest();
+        SwingUtilities.invokeAndWait(test);
+        robot.delay(3000);
+
+        try {
+            SwingUtilities.invokeAndWait(() ->
+                    pressCtrlKey(KeyEvent.VK_TAB));
+        } finally {
+            SwingUtilities.invokeAndWait(() -> test.frame.dispose());
+            robot.delay(2000);
+        }
+        System.out.println("Test PASSED");
+    }
+
+    private static void pressCtrlKey(int vk) {
+        robot.keyPress(KeyEvent.VK_CONTROL);
+        robot.keyPress(vk);
+        robot.keyRelease(vk);
+        robot.keyRelease(KeyEvent.VK_CONTROL);
+    }
+
+    @Override
+    public void run() {
+        frame = new JFrame(getClass().getSimpleName());
+        frame.pack();
+        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        frame.toFront();
+    }
+}

test/jdk/jb/sun/awt/macos/KeyboardLayoutSwitchTest/KeyboardLayoutSwitchTest.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+#
+# Copyright 2000-2019 JetBrains s.r.o.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# @test
+# @summary KeyboardLayoutSwitchTest.sh checks memory leaks
+# @run shell KeyboardLayoutSwitchTest.sh
+
+OS=`uname -s`
+case "$OS" in
+  Darwin)
+    echo "Detected OS $OS"
+    ;;
+  * )
+    echo "PASSED: The test is valid for MacOSX"
+    exit 0;
+    ;;
+esac
+
+if [ -z "${TESTSRC}" ]; then
+  echo "TESTSRC undefined: set to ."
+  TESTSRC=.
+fi
+
+if [ -z "${TESTCLASSES}" ]; then
+  echo "TESTCLASSES undefined: set to ."
+  TESTCLASSES=.
+fi
+
+if [ -z "${TESTJAVA}" ]; then
+  echo "TESTJAVA undefined: testing cancelled"
+  exit 1
+fi
+
+cd ${TESTSRC}
+//${TESTJAVA}/bin/javac -d ${TESTCLASSES} AppleSymbolicHotKeysReader.java
+${TESTJAVA}/bin/javac -d ${TESTCLASSES} KeyboardLayoutSwitchTest.java
+
+echo "reading current hot keys"
+oldKeyValue=$(defaults read "com.apple.symbolichotkeys" | grep -A10  " 60 =" | sed '$d' | sed '1d' | tr -d '\r\n' | tr -s ' ' | sed s/standard/\'standard\'/)
+
+defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 60 "{ enabled = 1; value = { parameters = ( 65535, 48, 262144 ); type = 'standard'; };}"
+${TESTJAVA}/bin/java -cp ${TESTCLASSES} KeyboardLayoutSwitchTest
+exit_code=$?
+defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 60 "$oldKeyValue"
+
+case $exit_code in
+0) echo "PASSED"
+   ;;
+*) echo "FAILED"
+   exit 1
+   ;;
+esac
+exit 0
+
+
+

test/jdk/jbProblemList.txt

@@ -760,6 +760,7 @@ javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java
 
 # jdk_net
 
+java/net/CookieHandler/B6791927.java                                                8234007 generic-all
 java/net/MulticastSocket/NoLoopbackPackets.java                                     7122846 macosx-all
 java/net/MulticastSocket/SetLoopbackMode.java                                       7122846 macosx-all
 java/net/MulticastSocket/Test.java                                                  7145658,8207404 macosx-all,aix-all
@@ -946,7 +947,7 @@ javax/swing/JSplitPane/4201995/bug4201995.java
 javax/swing/JSplitPane/4885629/bug4885629.java                                      8019935,8194941 macosx-all,linux-all,windows-all (windows: commit testing)
 javax/swing/JTabbedPane/4361477/bug4361477.java                                     8170260 macosx-all,windows-all
 javax/swing/JTabbedPane/4624207/bug4624207.java                                     8197552,8064922 macosx-all,windows-all,linux-all
-javax/swing/JTabbedPane/7024235/Test7024235.java                                    8028281 macosx-all
+javax/swing/JTabbedPane/7024235/Test7024235.java                                    8028281,JBR-1977 macosx-all,linux-aarch64
 javax/swing/JTabbedPane/8007563/Test8007563.java                                    8051591 generic-all
 javax/swing/JTable/4235420/bug4235420.java                                          8079127 generic-all
 javax/swing/JTable/6263446/bug6263446.java                                          8169959 macosx-all,windows-all
@@ -1168,3 +1169,26 @@ tools/jlink/plugins/IncludeLocalesPluginTest.java
 tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java                nobug windows-6.1 fails on Windows 7 only
 tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java                     nobug windows-6.1 fails on Windows 7 only
 tools/launcher/modules/patch/systemmodules/PatchSystemModules.java                  nobug windows-6.1 fails on Windows 7 only
+
+# aarch64: GTK look and feel - not supported
+java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java               JBR-1977 linux-aarch64
+java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java                     JBR-1977 linux-aarch64
+javax/swing/JColorChooser/Test6707406.java                                          JBR-1977 linux-aarch64
+javax/swing/JFileChooser/8013442/Test8013442.java                                   JBR-1977 linux-aarch64
+javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java                   JBR-1977 linux-aarch64
+javax/swing/JInternalFrame/8075314/bug8075314.java                                  JBR-1977 linux-aarch64
+javax/swing/JInternalFrame/NormalBoundsTest.java                                    JBR-1977 linux-aarch64
+javax/swing/JList/BasicListTest.java                                                JBR-1977 linux-aarch64
+javax/swing/JList/ListSelectionModelTest.java                                       JBR-1977 linux-aarch64
+javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java                           JBR-1977 linux-aarch64
+javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java                    JBR-1977 linux-aarch64
+javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java    JBR-1977 linux-aarch64
+javax/swing/JScrollBar/7163696/Test7163696.java                                     JBR-1977 linux-aarch64
+javax/swing/JSlider/6794831/bug6794831.java                                         JBR-1977 linux-aarch64
+javax/swing/JSpinner/WrongEditorTextFieldFont/FontByDefault.java                    JBR-1977 linux-aarch64
+javax/swing/JSpinner/WrongEditorTextFieldFont/FontSetByUser.java                    JBR-1977 linux-aarch64
+javax/swing/JSpinner/WrongEditorTextFieldFont/FontSetToNull.java                    JBR-1977 linux-aarch64
+javax/swing/JTextArea/4697612/bug4697612.java                                       JBR-1977 linux-aarch64
+javax/swing/LookAndFeel/8145547/DemandGTK.java                                      JBR-1977 linux-aarch64
+javax/swing/LookAndFeel/8146276/NimbusGlueTest.java                                 JBR-1977 linux-aarch64
+sanity/client/SwingSet/src/GridBagLayoutDemoTest.java                               JBR-1977 linux-aarch64

test/jdk/jbcommitProblemList.txt

@@ -52,7 +52,7 @@ java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogT
 java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html    nobug windows-all reproduced with Adopt
 java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java                              nobug windows-all
 java/awt/List/ActionAfterRemove/ActionAfterRemove.java                                      nobug windows-all
-java/awt/List/ActionEventTest/ActionEventTest.java                                          nobug linux-all
+java/awt/List/ActionEventTest/ActionEventTest.java                                          nobug generic-all timeout
 java/awt/List/EmptyListEventTest/EmptyListEventTest.java                                    nobug windows-all
 java/awt/List/ItemEventTest/ItemEventTest.java                                              nobug macosx-all,windows-all
 java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java                          nobug macosx-all,windows-all
@@ -104,6 +104,7 @@ java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.
 java/awt/Window/ShapedAndTranslucentWindows/Translucent.java                                nobug windows-all,macosx-all
 java/awt/Window/ShapedAndTranslucentWindows/WindowOpacity.java                              nobug windows-all
 java/awt/Window/TopLevelLocation/TopLevelLocation.java                                      nobug linux-all,macosx-all
+java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java                                  nobug macosx-all timeout
 java/awt/Window/WindowOwnedByEmbeddedFrameTest/WindowOwnedByEmbeddedFrameTest.java          nobug macosx-all
 java/awt/Window/WindowResizing/DoubleClickTitleBarTest.java                                 nobug macosx-all
 java/awt/datatransfer/Independence/IndependenceAWTTest.java                                 nobug linux-all
@@ -184,7 +185,7 @@ javax/swing/JPopupMenu/6827786/bug6827786.java
 javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java                      nobug macosx-all,windows-all
 javax/swing/JRadioButton/8041561/bug8041561.java                                            nobug windows-all
 javax/swing/JScrollBar/7163696/Test7163696.java                                             nobug windows-all
-javax/swing/JScrollBar/bug4202954/bug4202954.java                                           nobug windows-all
+javax/swing/JScrollBar/bug4202954/bug4202954.java                                           nobug generic-all timeout
 javax/swing/JSlider/6401380/bug6401380.java                                                 nobug windows-all
 javax/swing/JTabbedPane/7161568/bug7161568.java                                             nobug windows-all,linux-all
 javax/swing/JTabbedPane/7170310/bug7170310.java                                             nobug macosx-all,linux-all