8186549: move ExtendedRobot closer to tests

Reviewed-by: serb
2025-09-19 18:44:38 +02:00 · 2018-11-13 07:11:50 -08:00 · 2018-11-13 07:11:50 -08:00 · a4b9ae8bb3
commit a4b9ae8bb3
parent 5d603b77d9
343 changed files with 342 additions and 342 deletions
--- a/test/jdk/java/awt/Component/PaintAll/PaintAll.java
+++ b/test/jdk/java/awt/Component/PaintAll/PaintAll.java
@ -47,7 +47,7 @@ import java.awt.image.BufferedImage;
  @bug 6596915
  @summary Test Component.paintAll() method
  @author sergey.bylokhov@oracle.com: area=awt.component
-  @library ../../../../lib/testlibrary/
+  @library /lib/client/
  @build ExtendedRobot
  @run main PaintAll
 */
--- a/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java
+++ b/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java
@ -29,7 +29,7 @@ import java.awt.*;
 * @summary An attempt to set non-trivial background, shape, or translucency
 *          to a decorated toplevel should end with an exception.
 * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main DecoratedExceptions
 */
--- a/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java
+++ b/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java
@ -35,7 +35,7 @@ import java.util.Vector;
 *          added to it & each components are setted with different cursors types.
 *          Dispose the parent & collect GC. Garbage collection should happen
 * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main/othervm -Xmx20m DisposeParentGC
 */
--- a/test/jdk/java/awt/Frame/FramesGC/FramesGC.java
+++ b/test/jdk/java/awt/Frame/FramesGC/FramesGC.java
@ -33,7 +33,7 @@ import java.util.Vector;
 * @key headful
 * @summary Verify that disposed frames are collected with GC
 * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main/othervm -Xmx20m FramesGC
 */
--- a/test/jdk/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java
+++ b/test/jdk/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java
@ -36,7 +36,7 @@ import java.lang.reflect.InvocationTargetException;
 * @summary Set extendedState Frame.MAXIMIZED_BOTH for undecorated Frame and JFrame.
 *          Check if resulted size is equal to GraphicsEnvironment.getMaximumWindowBounds().
 *
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main MaximizedUndecorated
 */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java
@ -27,7 +27,7 @@
 * @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus
 * @author Jitender(jitender.singh@eng.sun.com) area=AWT
 * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main ActiveAWTWindowTest
 */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java
@ -27,7 +27,7 @@
 * @summary To check proper WINDOW_EVENTS are triggered when JFrame gains or losses the focus
 * @author Jitender(jitender.singh@eng.sun.com) area=AWT
 * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main ActiveSwingWindowTest
 */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java
@ -27,7 +27,7 @@
 * @summary To make sure Undecorated Frame triggers correct windows events while closing
 * @author Jitender(jitender.singh@eng.sun.com) area=AWT*
 * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main FrameCloseTest
 */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java
@ -28,7 +28,7 @@
 *          all the components on it are repainted correctly
 * @author Jitender(jitender.singh@eng.sun.com) area=AWT
 * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
 * @build ExtendedRobot
 * @run main RepaintTest
 */
--- a/test/jdk/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java
+++ b/test/jdk/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java
@ -33,7 +33,7 @@ import java.awt.GraphicsEnvironment;
 * @key headful
 * @bug 8019587
 * @author Sergey Bylokhov
- * @library ../../../lib/testlibrary/
+ * @library /lib/client/
 * @build ExtendedRobot
 * @run main IncorrectDisplayModeExitFullscreen
 */
--- a/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java
+++ b/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java
@ -28,7 +28,7 @@
  @requires (os.family == "linux") | (os.family == "solaris")
  @summary List does not honor user specified background, foreground colors on XToolkit
  @author Dmitry Cherepanov  area=awt.list
-  @library ../../../../lib/testlibrary
+  @library /lib/client
  @build ExtendedRobot
  @run main SetBackgroundTest
 */
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a null Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a null Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a hidden Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a hidden Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a visible Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a visible Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a null Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a null Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a hidden Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a hidden Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a visible Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a visible Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java
@ -29,7 +29,7 @@ import java.awt.Dialog;
 * @bug 8054359 7186009
 * @summary Check whether a FileDialog set to document modality behaves as expected.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java
@ -31,7 +31,7 @@
 *          created with a null Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java
@ -31,7 +31,7 @@
 *          created with a null Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java
@ -31,7 +31,7 @@
 *          created with a hidden Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java
@ -31,7 +31,7 @@
 *          created with a hidden Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java
@ -31,7 +31,7 @@
 *          created with a visible Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java
@ -31,7 +31,7 @@
 *          created with a visible Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java
@ -31,7 +31,7 @@
 *          created with a null Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java
@ -31,7 +31,7 @@
 *          created with a null Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java
@ -31,7 +31,7 @@
 *          created with a hidden Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java
@ -31,7 +31,7 @@
 *          created with a hidden Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java
@ -31,7 +31,7 @@
 *          created with a visible Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java
@ -31,7 +31,7 @@
 *          created with a visible Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java
@ -29,7 +29,7 @@ import java.awt.Dialog;
 * @bug 8054359
 * @summary Check whether a modeless FileDialog behaves as expected.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a null Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a null Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a hidden Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a hidden Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a visible Frame constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          created with a visible Dialog constructor. Also check if other
 *          windows are blocked by the FileDialog too.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java
@ -29,7 +29,7 @@ import java.awt.Dialog;
 * @bug 8054359 7186009
 * @summary Check whether a FileDialog set to toolkit modality behaves as expected.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Dialog.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Dialog.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Dialog.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java
@ -30,7 +30,7 @@
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Dialog.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java
@ -31,7 +31,7 @@
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Dialog.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Dialog.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also if the other windows
 *          receive mouse and key events.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also if the other windows
 *          receive mouse and key events.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java
@ -31,7 +31,7 @@
 *          and respond to key events. Check also if the other windows
 *          receive mouse and key events.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java
@ -31,7 +31,7 @@
 *          and respond to key events. Check also if the other windows
 *          receive mouse and key events.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java
@ -34,7 +34,7 @@ import static jdk.test.lib.Asserts.*;
 *          whether all the windows lying down the document root
 *          (Frame) get blocked.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of the blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of the blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of the blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java
@ -31,7 +31,7 @@
 *          and respond to key events. Check also the correctness
 *          of the blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java
@ -31,7 +31,7 @@
 *          and respond to key events. Check also the correctness
 *          of the blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events. Check also the correctness
 *          of the blocking behavior for the parent Frame.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java
@ -30,7 +30,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Check also the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java
@ -31,7 +31,7 @@
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java
@ -32,7 +32,7 @@ import java.awt.Dialog;
 *          and respond to key events, when there are other windows shown.
 *          Also check the correctness of blocking behavior for other windows shown.
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java
@ -30,7 +30,7 @@ import java.awt.Dialog;
 * @summary Check whether an application modal Dialog receives focus; check
 *          if its components receive focus and respond to key events
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java
@ -30,7 +30,7 @@ import java.awt.Dialog;
 * @summary Check whether a document modal Dialog receives focus; check
 *          if its components receive focus and respond to key events
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java
@ -30,7 +30,7 @@ import java.awt.Dialog;
 * @summary Check whether a modeless Dialog receives focus; check
 *          if its components receive focus and respond to key events
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java
@ -29,7 +29,7 @@
 * @summary Check whether a non-modal Dialog receives focus; check
 *          if its components receive focus and respond to key events
 *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
 * @library /test/lib
 * @build ExtendedRobot
 * @build Flag
--- a/Show more
+++ b/Show more