8305329: [8u] Unify test libraries into single test library - step 1

hotspot/test/TEST.ROOT

@@ -37,3 +37,7 @@ requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java
 requires.properties=sun.arch.data.model \
     vm.flavor \
     vm.bits
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../

jdk/test/TEST.ROOT

@@ -25,3 +25,7 @@ requires.properties=sun.arch.data.model
 
 # Group definitions
 groups=TEST.groups [closed/TEST.groups]
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../

jdk/test/java/net/MulticastSocket/JoinLeave.java

@@ -25,7 +25,7 @@
  * @test
  * @bug 4091811 4148753 4102731
  * @summary Test java.net.MulticastSocket joinGroup and leaveGroup
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main JoinLeave

jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java

@@ -32,7 +32,7 @@
  * @test
  * @bug 6458027
  * @summary Disabling IPv6 on a specific network interface causes problems.
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main SetGetNetworkInterfaceTest

jdk/test/java/net/MulticastSocket/Test.java

@@ -34,7 +34,7 @@
  * @test
  * @bug 4488458
  * @summary IPv4 and IPv6 multicasting broken on Linux
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main Test

jdk/test/java/net/MulticastSocket/TestInterfaces.java

@@ -26,7 +26,7 @@
  * @bug 4422122
  * @summary Test that MulticastSocket.getInterface returns the
  *          same InetAddress set by MulticastSocket.setInterface
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main TestInterfaces

jdk/test/java/security/SignedObject/Chain.java

@@ -37,7 +37,7 @@
  * @test
  * @bug 8050374 8181048 8146293
  * @summary Verify a chain of signed objects
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.SigTestUtil
  * @run main Chain
  */

jdk/test/java/util/Arrays/TimSortStackSize2.java

@@ -26,7 +26,7 @@
  * @bug 8072909
  * @summary Test TimSort stack size on big arrays
  * @key intermittent
- * @library /lib/testlibrary /lib
+ * @library /lib/testlibrary /test/lib
  * @build jdk.testlibrary.*
  * @build TimSortStackSize2
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java

@@ -27,7 +27,7 @@
  * @summary Testing TLS engines re-handshaking with cipher change. New cipher
  *          is taken randomly from the supporetd ciphers list.
  * @key randomness
- * @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
+ * @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
  * @build jdk.test.lib.RandomFactory
  * @run main/othervm -Dtest.security.protocol=TLS TLSRehandshakeWithCipherChangeTest
  */

jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java

@@ -27,7 +27,7 @@
  * @summary Testing TLS engines re-handshaking with cipher change. New cipher
  *          is taken randomly from the supporetd ciphers list.
  * @key randomness
- * @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
+ * @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
  * @build jdk.test.lib.RandomFactory
  * @run main/othervm -Dtest.security.protocol=TLSv1 TLSRehandshakeWithCipherChangeTest
  */

jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java

@@ -27,7 +27,7 @@
  * @summary Testing TLS engines re-handshaking with cipher change. New cipher
  *          is taken randomly from the supporetd ciphers list.
  * @key randomness
- * @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
+ * @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
  * @build jdk.test.lib.RandomFactory
  * @run main/othervm -Dtest.security.protocol=TLSv1.1 TLSRehandshakeWithCipherChangeTest
  */

jdk/test/jdk/internal/platform/cgroup/TestCgroupMetrics.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /lib /
+ * @library /test/lib /
  * @run main TestCgroupMetrics
  */
 

jdk/test/jdk/internal/platform/cgroup/TestCgroupSubsystemController.java

@@ -45,7 +45,7 @@
  * @test
  * @requires os.family == "linux"
  * @modules java.base/jdk.internal.platform
- * @library /lib
+ * @library /test/lib
  * @library /lib/testlibrary
  * @run junit/othervm TestCgroupSubsystemController
  */

jdk/test/jdk/internal/platform/docker/TestDockerBasic.java

@@ -25,7 +25,7 @@
  * @test
  * @bug 8293540
  * @summary Verify that -XshowSettings:system works
- * @library /lib /
+ * @library /test/lib /
  * @run main/timeout=360 TestDockerBasic
  */
 

jdk/test/jdk/internal/platform/docker/TestDockerCpuMetrics.java

@@ -33,7 +33,7 @@
 /*
  * @test
  * @summary Test JDK Metrics class when running inside docker container
- * @library /lib /
+ * @library /test/lib /
  * @build MetricsCpuTester
  * @run main/timeout=360 TestDockerCpuMetrics
  */

jdk/test/jdk/internal/platform/docker/TestDockerMemoryMetrics.java

@@ -31,7 +31,7 @@
 /*
  * @test
  * @summary Test JDK Metrics class when running inside docker container
- * @library /lib /
+ * @library /test/lib /
  * @build MetricsMemoryTester
  * @run main/timeout=360 TestDockerMemoryMetrics
  */

jdk/test/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java

@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8242480
- * @library /lib
+ * @library /test/lib
  * @build GetFreeSwapSpaceSize
  * @run driver TestGetFreeSwapSpaceSize
  */

jdk/test/jdk/internal/platform/docker/TestSystemMetrics.java

@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Test JDK Metrics class when running inside docker container
- * @library /lib
+ * @library /test/lib
  * @run main TestSystemMetrics
  */
 

jdk/test/jdk/internal/platform/docker/TestUseContainerSupport.java

@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary UseContainerSupport flag should reflect Metrics being available
- * @library /lib
+ * @library /test/lib
  * @build CheckUseContainerSupport
  * @run main/timeout=360 TestUseContainerSupport
  */

jdk/test/jdk/jfr/api/consumer/TestFieldAccess.java

@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestFieldAccess
  */
 public class TestFieldAccess {

jdk/test/jdk/jfr/api/consumer/TestGetStackTrace.java

@@ -47,7 +47,7 @@
  * @summary Verifies that a recorded JFR event has the correct stack trace info
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestGetStackTrace
  */
 public class TestGetStackTrace {

jdk/test/jdk/jfr/api/consumer/TestHiddenMethod.java

@@ -47,7 +47,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
 
  *

jdk/test/jdk/jfr/api/consumer/TestMethodGetModifiers.java

@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xint jdk.jfr.api.consumer.TestMethodGetModifiers
  */
 public final class TestMethodGetModifiers {

jdk/test/jdk/jfr/api/consumer/TestReadTwice.java

@@ -43,7 +43,7 @@
  * @summary Reads the recorded file two times and verifies that both reads are the same
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestReadTwice
  */
 public class TestReadTwice {

jdk/test/jdk/jfr/api/consumer/TestRecordedClassLoader.java

@@ -41,7 +41,7 @@
  * @summary Verifies the methods of the RecordedClassLoader
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedClassLoader
  */
 public class TestRecordedClassLoader {

jdk/test/jdk/jfr/api/consumer/TestRecordedEvent.java

@@ -42,7 +42,7 @@
  * @summary Verifies the methods of the RecordedEvent
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEvent
  */
 public class TestRecordedEvent {

jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThread.java

@@ -39,7 +39,7 @@
  * @summary Tests that the RecordedEvent.getThread() returns th expected info
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEventGetThread
  */
 public class TestRecordedEventGetThread {

jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java

@@ -41,7 +41,7 @@
  * @summary Tests that the RecordedEvent.getThread() returns th expected info
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEventGetThreadOther
  */
 public class TestRecordedEventGetThreadOther {

jdk/test/jdk/jfr/api/consumer/TestRecordedFrame.java

@@ -42,7 +42,7 @@
  * @summary Simple test for RecordedFrame APIs
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xint  -XX:+UseInterpreter -Dinterpreted=true  jdk.jfr.api.consumer.TestRecordedFrame
  * @run main/othervm -Xcomp -XX:-UseInterpreter -Dinterpreted=false jdk.jfr.api.consumer.TestRecordedFrame
  */

jdk/test/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java

@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedFullStackTrace
  */
 public class TestRecordedFullStackTrace {

jdk/test/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java

@@ -38,7 +38,7 @@
  * @summary Tests that an instant event gets recorded with its start time equal to its end time
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedInstantEventTimestamp
  */
 public class TestRecordedInstantEventTimestamp {

jdk/test/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java

@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedMethodDescriptor
  */
 public final class TestRecordedMethodDescriptor {

jdk/test/jdk/jfr/api/consumer/TestRecordedObject.java

@@ -52,7 +52,7 @@
  * @summary Verifies the methods of the RecordedObject
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedObject
  */
 public class TestRecordedObject {

jdk/test/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java

@@ -38,7 +38,7 @@
  * @summary Tests getParent method in RecordedThreadGroup
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedThreadGroupParent
  */
 public class TestRecordedThreadGroupParent {

jdk/test/jdk/jfr/api/consumer/TestRecordingFile.java

@@ -54,7 +54,7 @@
  * @summary Verifies that all methods in RecordingFIle are working
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingFile
  */
 public class TestRecordingFile {

jdk/test/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java

@@ -38,7 +38,7 @@
  * @summary Verifies that RecordingFile.readEvent() throws EOF when past the last record
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingFileReadEventEof
  */
 public class TestRecordingFileReadEventEof {

jdk/test/jdk/jfr/api/consumer/TestRecordingInternals.java

@@ -37,7 +37,7 @@
  * @summary Tests that chunks are read in order and constant pools from multiple chunks can be read
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingInternals
  */
 public class TestRecordingInternals {

jdk/test/jdk/jfr/api/consumer/TestSingleRecordedEvent.java

@@ -39,7 +39,7 @@
  * @summary Verifies that a single JFR event is recorded as expected
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestSingleRecordedEvent
  */
 public class TestSingleRecordedEvent {

jdk/test/jdk/jfr/api/consumer/TestToString.java

@@ -39,7 +39,7 @@
  * @summary Sanity checks that RecordedEvent#toString returns something valid
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestToString
  */
 public class TestToString {

jdk/test/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java

@@ -42,7 +42,7 @@
  * @summary Verifies that the recorded value descriptors are correct
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm  jdk.jfr.api.consumer.TestValueDescriptorRecorded
  */
 public class TestValueDescriptorRecorded {

jdk/test/jdk/jfr/api/event/TestAbstractEvent.java

@@ -42,7 +42,7 @@
  * @summary Tests that abstract events are not part of metadata
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestAbstractEvent
  * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.api.event.TestAbstractEvent
  */

jdk/test/jdk/jfr/api/event/TestBeginEnd.java

@@ -37,7 +37,7 @@
  * @summary Test for RecordedEvent.getDuration()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestBeginEnd
  */
 public class TestBeginEnd {

jdk/test/jdk/jfr/api/event/TestClinitRegistration.java

@@ -42,7 +42,7 @@
  * @summary Test enable/disable event and verify recording has expected events.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestClinitRegistration
  */
 

jdk/test/jdk/jfr/api/event/TestClonedEvent.java

@@ -40,7 +40,7 @@
  * @summary Tests that a cloned event can be successfully committed.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestClonedEvent
  */