# HG changeset patch
# User cjplummer
# Date 1446145373 25200
# Node ID 7dde7a2714929265a1902e5c6659cb58464b0485
# Parent  400008d8de8cd947af6a9ff4644d96ca821c673d
8140189: [TESTBUG] Get rid of "@library /../../test/lib" in jtreg tests
Summary: Use new external.lib.roots property in TEST.ROOT so /../../test/lib is not needed.
Reviewed-by: mseledtsov, sla, iklam

diff -r 400008d8de8c -r 7dde7a271492 jdk/test/TEST.ROOT
--- a/jdk/test/TEST.ROOT	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/TEST.ROOT	Thu Oct 29 12:02:53 2015 -0700
@@ -28,3 +28,7 @@
 
 # Tests using jtreg 4.1 b11 features
 requiredVersion=4.1 b11
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../
diff -r 400008d8de8c -r 7dde7a271492 jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Thu Oct 29 12:02:53 2015 -0700
@@ -38,7 +38,7 @@
  * @bug 6455258
  * @summary Sanity test for com.sun.management.HotSpotDiagnosticMXBean.dumpHeap method
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
  * @build jdk.test.lib.hprof.module.*
diff -r 400008d8de8c -r 7dde7a271492 jdk/test/java/util/Arrays/TimSortStackSize2.java
--- a/jdk/test/java/util/Arrays/TimSortStackSize2.java	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/java/util/Arrays/TimSortStackSize2.java	Thu Oct 29 12:02:53 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8072909
- * @library /lib/testlibrary /../../test/lib
+ * @library /lib/testlibrary /test/lib
  * @build jdk.testlibrary.*
  * @build TimSortStackSize2
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff -r 400008d8de8c -r 7dde7a271492 jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java
--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	Thu Oct 29 12:02:53 2015 -0700
@@ -42,7 +42,7 @@
  * @summary setInterval() for local MonitoredHost and local MonitoredVm
  * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
  * @run main TestPollingInterval
diff -r 400008d8de8c -r 7dde7a271492 jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
--- a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java	Thu Oct 29 12:02:53 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Basic test for jhsdb launcher
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
diff -r 400008d8de8c -r 7dde7a271492 jdk/test/sun/tools/jmap/BasicJMapTest.java
--- a/jdk/test/sun/tools/jmap/BasicJMapTest.java	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/sun/tools/jmap/BasicJMapTest.java	Thu Oct 29 12:02:53 2015 -0700
@@ -38,7 +38,7 @@
  * @summary Unit test for jmap utility
  * @key intermittent
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @modules java.management
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
diff -r 400008d8de8c -r 7dde7a271492 jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
--- a/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	Thu Oct 29 12:02:53 2015 -0700
@@ -36,7 +36,7 @@
  * @test
  * @bug 8042397
  * @summary Unit test for jmap utility test heap configuration reader
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.*
diff -r 400008d8de8c -r 7dde7a271492 jdk/test/sun/tools/jstack/DeadlockDetectionTest.java
--- a/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java	Wed Oct 28 19:07:12 2015 +0000
+++ b/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java	Thu Oct 29 12:02:53 2015 -0700
@@ -37,7 +37,7 @@
 /*
  * @test
  * @summary Test deadlock detection
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.*