Skip to content

Commit eace2d7

Browse files
committed
8305329: [8u] Unify test libraries into single test library - step 1
Reviewed-by: andrew
1 parent dd43bdd commit eace2d7

File tree

611 files changed

+477
-1918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

611 files changed

+477
-1918
lines changed

hotspot/test/TEST.ROOT

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java
3737
requires.properties=sun.arch.data.model \
3838
vm.flavor \
3939
vm.bits
40+
41+
# Path to libraries in the topmost test directory. This is needed so @library
42+
# does not need ../../ notation to reach them
43+
external.lib.roots = ../../

jdk/test/TEST.ROOT

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ requires.properties=sun.arch.data.model
2525

2626
# Group definitions
2727
groups=TEST.groups [closed/TEST.groups]
28+
29+
# Path to libraries in the topmost test directory. This is needed so @library
30+
# does not need ../../ notation to reach them
31+
external.lib.roots = ../../

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @bug 4091811 4148753 4102731
2727
* @summary Test java.net.MulticastSocket joinGroup and leaveGroup
28-
* @library /lib
28+
* @library /test/lib
2929
* @build jdk.test.lib.NetworkConfiguration
3030
* jdk.test.lib.Platform
3131
* @run main JoinLeave

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @test
3333
* @bug 6458027
3434
* @summary Disabling IPv6 on a specific network interface causes problems.
35-
* @library /lib
35+
* @library /test/lib
3636
* @build jdk.test.lib.NetworkConfiguration
3737
* jdk.test.lib.Platform
3838
* @run main SetGetNetworkInterfaceTest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* @test
3535
* @bug 4488458
3636
* @summary IPv4 and IPv6 multicasting broken on Linux
37-
* @library /lib
37+
* @library /test/lib
3838
* @build jdk.test.lib.NetworkConfiguration
3939
* jdk.test.lib.Platform
4040
* @run main Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @bug 4422122
2727
* @summary Test that MulticastSocket.getInterface returns the
2828
* same InetAddress set by MulticastSocket.setInterface
29-
* @library /lib
29+
* @library /test/lib
3030
* @build jdk.test.lib.NetworkConfiguration
3131
* jdk.test.lib.Platform
3232
* @run main TestInterfaces

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @test
3838
* @bug 8050374 8181048 8146293
3939
* @summary Verify a chain of signed objects
40-
* @library /lib
40+
* @library /test/lib
4141
* @build jdk.test.lib.SigTestUtil
4242
* @run main Chain
4343
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @bug 8072909
2727
* @summary Test TimSort stack size on big arrays
2828
* @key intermittent
29-
* @library /lib/testlibrary /lib
29+
* @library /lib/testlibrary /test/lib
3030
* @build jdk.testlibrary.*
3131
* @build TimSortStackSize2
3232
* @run driver ClassFileInstaller sun.hotspot.WhiteBox

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @summary Testing TLS engines re-handshaking with cipher change. New cipher
2828
* is taken randomly from the supporetd ciphers list.
2929
* @key randomness
30-
* @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
30+
* @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
3131
* @build jdk.test.lib.RandomFactory
3232
* @run main/othervm -Dtest.security.protocol=TLS TLSRehandshakeWithCipherChangeTest
3333
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @summary Testing TLS engines re-handshaking with cipher change. New cipher
2828
* is taken randomly from the supporetd ciphers list.
2929
* @key randomness
30-
* @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
30+
* @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
3131
* @build jdk.test.lib.RandomFactory
3232
* @run main/othervm -Dtest.security.protocol=TLSv1 TLSRehandshakeWithCipherChangeTest
3333
*/

0 commit comments

Comments
 (0)