--- a/langtools/test/tools/javac/7129225/TestImportStar.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/7129225/TestImportStar.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
 /* @test
  * @bug 7129225
  * @summary import xxx.* isn't handled correctly by annotation processing
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile/fail/ref=NegTest.ref -XDrawDiagnostics TestImportStar.java
  * @compile Anno.java AnnoProcessor.java

--- a/langtools/test/tools/javac/cast/intersection/model/Model01.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/cast/intersection/model/Model01.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 8002099
  * @summary Add support for intersection types in cast expression
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor ModelChecker
  * @compile -XDallowIntersectionTypes -processor ModelChecker Model01.java
  */

--- a/langtools/test/tools/javac/classreader/T7031108.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/classreader/T7031108.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 7031108
  * @summary NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor T7031108
  * @run main T7031108
  */

--- a/langtools/test/tools/javac/enum/6350057/T6350057.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/enum/6350057/T6350057.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6350057 7025809
  * @summary Test that parameters on implicit enum methods have the right kind
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor T6350057
  * @compile -processor T6350057 -proc:only TestEnum.java
  */

--- a/langtools/test/tools/javac/enum/6424358/T6424358.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/enum/6424358/T6424358.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6424358 7025809
  * @summary Synthesized static enum method values() is final
  * @author  Peter von der Ah\u00e9
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor T6424358
  * @compile -processor T6424358 -proc:only T6424358.java
  */

--- a/langtools/test/tools/javac/file/T7018098.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/file/T7018098.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 7018098
  * @summary CacheFSInfo persists too long
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor T7018098
  * @run main T7018098
  */

--- a/langtools/test/tools/javac/multicatch/model/ModelChecker.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/multicatch/model/ModelChecker.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6993963 7025809
  * @summary Project Coin: Use precise exception analysis for effectively final catch parameters
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor ModelChecker
  * @compile -processor ModelChecker Model01.java
  */

--- a/langtools/test/tools/javac/options/T7022337.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/options/T7022337.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @test
  * @bug 7022337
  * @summary repeated warnings about bootclasspath not set
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor T7022337
  * @run main T7022337
  */

--- a/langtools/test/tools/javac/processing/6348499/T6348499.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6348499/T6348499.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6441871
  * @summary javac crashes at com.sun.tools.javac.jvm.ClassReader$BadClassFile
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor A
  * @run main T6348499
  */

--- a/langtools/test/tools/javac/processing/6359313/T6359313.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6359313/T6359313.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6359313
  * @summary error compiling annotated package
  * @author  Peter von der Ah\u00e9
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile T6359313.java
  * @compile -processor T6359313 package-info.java Foo.java

--- a/langtools/test/tools/javac/processing/6365040/T6365040.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6365040/T6365040.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6365040 6358129
  * @summary Test -processor foo,bar,baz
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile ProcFoo.java
  * @compile ProcBar.java

--- a/langtools/test/tools/javac/processing/6413690/T6413690.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6413690/T6413690.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6413690 6380018
  * @summary JavacProcessingEnvironment does not enter trees from preceding rounds
  * @author  Peter von der Ah\u00e9
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile T6413690.java
  * @compile -XDfatalEnterError -verbose -processor T6413690 src/Super.java TestMe.java

--- a/langtools/test/tools/javac/processing/6414633/T6414633.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6414633/T6414633.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6414633 6440109
  * @summary Only the first processor message at a source location is reported
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build    JavacTestingAbstractProcessor A T6414633
  * @run main T6414633
  */

--- a/langtools/test/tools/javac/processing/6430209/T6430209.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6430209/T6430209.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6441871
  * @summary spurious compiler error elicited by packageElement.getEnclosedElements()
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor b6341534
  * @run main T6430209
  */

--- a/langtools/test/tools/javac/processing/6499119/ClassProcessor.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6499119/ClassProcessor.java	Fri Dec 21 08:45:43 2012 -0800
@@ -32,7 +32,7 @@
  * @test
  * @bug 6499119
  * @summary Created package-info class file modeled improperly
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile ClassProcessor.java package-info.java
  * @compile/process -cp . -processor ClassProcessor -Akind=java  java.lang.Object

--- a/langtools/test/tools/javac/processing/6511613/clss41701.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6511613/clss41701.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6511613
  * @summary javac unexpectedly doesn't fail in some cases if an annotation processor specified
  *
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor DummyProcessor
  * @compile/fail clss41701.java
  * @compile/fail -processor DummyProcessor clss41701.java

--- a/langtools/test/tools/javac/processing/6512707/T6512707.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6512707/T6512707.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6512707
  * @summary "incompatible types" after (unrelated) annotation processing
  * @author  Peter Runge
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile T6512707.java
  * @compile -processor T6512707 TestAnnotation.java

--- a/langtools/test/tools/javac/processing/6634138/T6634138.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6634138/T6634138.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6634138
  * @author  Joseph D. Darcy
  * @summary Verify source files output after processing is over are compiled
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile T6634138.java
  * @compile -processor T6634138 Dummy.java

--- a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.java	Fri Dec 21 08:45:43 2012 -0800
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 6994946
  * @summary option to specify only syntax errors as unrecoverable
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestProcessor
  * @compile/fail/ref=SemanticErrorTest.1.out -XDrawDiagnostics                                  -processor TestProcessor SemanticErrorTest.java
  * @compile/fail/ref=SemanticErrorTest.2.out -XDrawDiagnostics -XDonlySyntaxErrorsUnrecoverable -processor TestProcessor SemanticErrorTest.java

--- a/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.java	Fri Dec 21 08:45:43 2012 -0800
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 6994946
  * @summary option to specify only syntax errors as unrecoverable
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestProcessor
  * @compile/fail/ref=SyntaxErrorTest.out -XDrawDiagnostics                                  -processor TestProcessor SyntaxErrorTest.java
  * @compile/fail/ref=SyntaxErrorTest.out -XDrawDiagnostics -XDonlySyntaxErrorsUnrecoverable -processor TestProcessor SyntaxErrorTest.java

--- a/langtools/test/tools/javac/processing/T6920317.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/T6920317.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6920317
  * @summary package-info.java file has to be specified on the javac cmdline, else it will not be avail
- * @library ../lib
+ * @library /tools/javac/lib
  */
 
 import java.io.*;

--- a/langtools/test/tools/javac/processing/T7196462.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/T7196462.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 7196462
  * @summary JavacProcessingEnvironment should tolerate BasicJavacTask
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor T7196462
  * @compile/process -processor T7196462 T7196462.java
  */

--- a/langtools/test/tools/javac/processing/TestWarnErrorCount.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/TestWarnErrorCount.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @test
  * @bug 7022337
  * @summary repeated warnings about bootclasspath not set
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestWarnErrorCount
  * @run main TestWarnErrorCount
  */

--- a/langtools/test/tools/javac/processing/environment/TestSourceVersion.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/environment/TestSourceVersion.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6402506
  * @summary Test that getSourceVersion works properly
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile TestSourceVersion.java
  * @compile -processor TestSourceVersion -proc:only -source 1.2 -AExpectedVersion=RELEASE_2 HelloWorld.java

--- a/langtools/test/tools/javac/processing/environment/round/TestContext.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/environment/round/TestContext.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6988836
  * @summary A new JavacElements is created for each round of annotation processing
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestContext
  * @compile/process -processor TestContext -XprintRounds TestContext
  */

--- a/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6397298 6400986 6425592 6449798 6453386 6508401 6498938 6911854
  * @summary Tests that getElementsAnnotatedWith works properly.
  * @author  Joseph D. Darcy
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile TestElementsAnnotatedWith.java
  * @compile InheritedAnnotation.java

--- a/langtools/test/tools/javac/processing/errors/TestErrorCount.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/errors/TestErrorCount.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6988079
  * @summary Errors reported via Messager.printMessage(ERROR,"error message") are not tallied correctly
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestErrorCount
  * @compile/fail/ref=TestErrorCount.out -XDrawDiagnostics -processor TestErrorCount TestErrorCount.java
  */

--- a/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6403459
  * @summary Test that generating programs with syntax errors is a fatal condition
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile TestReturnCode.java
  * @compile TestFatalityOfParseErrors.java

--- a/langtools/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6406212
  * @summary Test that annotation processor options with illegal syntax are rejected
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor CompileFail
  * @compile TestOptionSyntaxErrors.java
  * @run main CompileFail CMDERR -A TestOptionSyntaxErrors.java

--- a/langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6988407
  * @summary javac crashes running processor on errant code; it used to print error message
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestParseErrors
  * @compile/fail/ref=TestParseErrors.out -XDrawDiagnostics -proc:only -processor TestParseErrors ParseErrors.java
  */

--- a/langtools/test/tools/javac/processing/errors/TestReturnCode.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/errors/TestReturnCode.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6403468
  * @summary Test that an erroneous return code results from raising an error.
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor CompileFail
  * @compile TestReturnCode.java
  *

--- a/langtools/test/tools/javac/processing/filer/TestFilerConstraints.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/filer/TestFilerConstraints.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6380018 6453386 6457283
  * @summary Test that the constraints guaranteed by the Filer and maintained
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build TestFilerConstraints
  * @compile -encoding iso-8859-1 -processor TestFilerConstraints -proc:only TestFilerConstraints.java
  */

--- a/langtools/test/tools/javac/processing/filer/TestGetResource.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/filer/TestGetResource.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6380018 6449798
  * @summary Test Filer.getResource
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build  JavacTestingAbstractProcessor TestGetResource
  * @compile -processor TestGetResource -proc:only -Aphase=write TestGetResource.java
  * @compile -processor TestGetResource -proc:only -Aphase=read  TestGetResource.java

--- a/langtools/test/tools/javac/processing/filer/TestGetResource2.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/filer/TestGetResource2.java	Fri Dec 21 08:45:43 2012 -0800
@@ -24,7 +24,7 @@
 /* @test
  * @bug 6929404
  * @summary Filer.getResource(SOURCE_PATH, ...) does not work when -sourcepath contains >1 entry
- * @library ../../lib
+ * @library /tools/javac/lib
  */
 
 import java.io.*;

--- a/langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6502392
  * @summary Invalid relative names for Filer.createResource and Filer.getResource
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile TestInvalidRelativeNames.java
  * @compile/process -processor TestInvalidRelativeNames java.lang.Object

--- a/langtools/test/tools/javac/processing/filer/TestLastRound.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/filer/TestLastRound.java	Fri Dec 21 08:45:43 2012 -0800
@@ -24,7 +24,7 @@
 /*
  * @test 6966604
  * @summary JavacFiler not correctly notified of lastRound
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile TestLastRound.java
  * @compile/fail/ref=TestLastRound.out -XDrawDiagnostics -Werror -proc:only -processor TestLastRound TestLastRound.java

--- a/langtools/test/tools/javac/processing/filer/TestPackageInfo.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/filer/TestPackageInfo.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6380018 6392177 6993311
  * @summary Test the ability to create and process package-info.java files
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile TestPackageInfo.java
  * @compile -processor TestPackageInfo -proc:only foo/bar/package-info.java TestPackageInfo.java

--- a/langtools/test/tools/javac/processing/filer/TestValidRelativeNames.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/filer/TestValidRelativeNames.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6999891
  * @summary Test valid relative names for Filer.createResource and Filer.getResource
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile TestValidRelativeNames.java
  * @compile/process -processor TestValidRelativeNames -Amode=create java.lang.Object

--- a/langtools/test/tools/javac/processing/messager/6362067/T6362067.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/messager/6362067/T6362067.java	Fri Dec 21 08:45:43 2012 -0800
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     6362067
  * @summary Messager methods do not print out source position information
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor T6362067
  * @compile -processor T6362067 -proc:only T6362067.java
  * @compile/ref=T6362067.out -XDrawDiagnostics -processor T6362067 -proc:only T6362067.java

--- a/langtools/test/tools/javac/processing/messager/MessagerBasics.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/messager/MessagerBasics.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6341173 6341072
  * @summary Test presence of Messager methods
  * @author  Joseph D. Darcy
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile MessagerBasics.java
  * @compile -processor MessagerBasics -proc:only MessagerBasics.java

--- a/langtools/test/tools/javac/processing/model/6194785/T6194785.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/6194785/T6194785.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6194785
  * @summary ParameterDeclaration.getSimpleName does not return actual name from class files
  * @author  Peter von der Ah\u00e9
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile -g T6194785.java T6194785a.java
  * @compile -processor T6194785 foo.T6194785a T6194785.java

--- a/langtools/test/tools/javac/processing/model/6341534/T6341534.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/6341534/T6341534.java	Fri Dec 21 08:45:43 2012 -0800
@@ -27,7 +27,7 @@
  * @summary PackageElement.getEnclosedElements results in NullPointerException from parse(JavaCompiler.java:429)
  * @author  Steve Sides
  * @author  Peter von der Ahe
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile T6341534.java
  * @compile -proc:only -processor T6341534 dir/package-info.java

--- a/langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6449781 6930508
  * @summary Test that reported names of anonymous classes are non-null.
  * @author  Joseph D. Darcy
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestAnonSourceNames
  * @compile -processor TestAnonSourceNames TestAnonClassNames.java
  * @run main TestAnonClassNames

--- a/langtools/test/tools/javac/processing/model/element/TestElement.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestElement.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6453386
  * @summary Test basic properties of javax.lang.element.Element
  * @author  Joseph D. Darcy
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestElement
  * @compile -processor TestElement -proc:only TestElement.java
  */

--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @test
  * @bug 6639645 7026414 7025809
  * @summary Modeling type implementing missing interfaces
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestMissingElement
  * @compile -proc:only -XprintRounds -processor TestMissingElement InvalidSource.java
  */

--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingClass.java
  * @run main TestMissingClass

--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @clean MissingGenericClass1
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericClass1.java

--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @clean MissingGenericClass2
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericClass2.java

--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @clean MissingGenericInterface1
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericInterface1.java

--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @clean MissingGenericInterface2
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericInterface2.java

--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingInterface.java
  * @run main TestMissingInterface

--- a/langtools/test/tools/javac/processing/model/element/TestNames.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestNames.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6380016
  * @summary Test that the constraints guaranteed by the Filer and maintained
  * @author  Joseph D. Darcy
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestNames
  * @compile -processor TestNames -proc:only TestNames.java
  */

--- a/langtools/test/tools/javac/processing/model/element/TestPackageElement.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestPackageElement.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6449798 6399404
  * @summary Test basic workings of PackageElement
  * @author  Joseph D. Darcy
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestPackageElement
  * @compile -processor TestPackageElement -proc:only TestPackageElement.java
  */

--- a/langtools/test/tools/javac/processing/model/element/TestResourceElement.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestResourceElement.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6967842
  * @summary Element not returned from tree API for ARM resource variables.
  * @author A. Sundararajan
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestResourceElement
  * @compile -processor TestResourceElement -proc:only TestResourceElement.java
  */

--- a/langtools/test/tools/javac/processing/model/element/TestResourceVariable.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestResourceVariable.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug  6911256 6964740 6967842 6961571 7025809
  * @summary Test that the resource variable kind is appropriately set
  * @author  Joseph D. Darcy
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestResourceVariable
  * @compile -processor TestResourceVariable -proc:only TestResourceVariable.java
  */

--- a/langtools/test/tools/javac/processing/model/element/TestTypeParameter.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestTypeParameter.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6505047
  * @summary javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestTypeParameter
  * @compile -processor TestTypeParameter -proc:only TestTypeParameter.java
  */

--- a/langtools/test/tools/javac/processing/model/element/TypeParamBounds.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TypeParamBounds.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6423972
  * @summary Tests TypeParameter.getBounds.
  * @author  Scott Seligman
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TypeParamBounds
  * @compile -processor TypeParamBounds -proc:only TypeParamBounds.java
  */

--- a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6362178
  * @summary MirroredType[s]Exception shouldn't be created too eagerly
  * @author  Scott Seligman
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile -g OverEager.java
  * @compile -processor OverEager -proc:only OverEager.java

--- a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug     6519115
  * @summary Verify MirroredTypeException vs MirroredTypesException is thrown
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile Plurality.java
  * @compile -processor Plurality -proc:only Plurality.java

--- a/langtools/test/tools/javac/processing/model/type/NoTypes.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/type/NoTypes.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6418666 6423973 6453386 7025809
  * @summary Test the NoTypes: VOID, PACKAGE, NONE
  * @author  Scott Seligman
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile -g NoTypes.java
  * @compile -processor NoTypes -proc:only NoTypes.java

--- a/langtools/test/tools/javac/processing/model/type/TestUnionType.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/type/TestUnionType.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug     7029150 7025809
  * @summary Test support for union types
- * @library ../../../lib
+ * @library /tools/javac/lib
  */
 
 import java.net.URI;

--- a/langtools/test/tools/javac/processing/model/util/BinaryName.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/BinaryName.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6346251
  * @summary Test Elements.getBinaryName
  * @author  Scott Seligman
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor BinaryName
  * @compile -processor BinaryName -proc:only BinaryName.java
  */

--- a/langtools/test/tools/javac/processing/model/util/GetTypeElemBadArg.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/GetTypeElemBadArg.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6346506 6408241
  * @summary getTypeElement should tolerate a type that can't be found
  * @author  Scott Seligman
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor GetTypeElemBadArg
  * @compile -processor GetTypeElemBadArg -proc:only GetTypeElemBadArg.java
  */

--- a/langtools/test/tools/javac/processing/model/util/NoSupers.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/NoSupers.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6346453
  * @summary directSupertypes should return empty list if arg has no supertypes
  * @author  Scott Seligman
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor NoSupers
  * @compile -processor NoSupers -proc:only NoSupers.java
  */

--- a/langtools/test/tools/javac/processing/model/util/OverridesSpecEx.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/OverridesSpecEx.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6453386
  * @summary Verify that example code in Elements.overrides works as spec'ed.
  * @author  Scott Seligman
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile -g OverridesSpecEx.java
  * @compile -processor OverridesSpecEx -proc:only OverridesSpecEx.java

--- a/langtools/test/tools/javac/processing/model/util/TypesBadArg.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/TypesBadArg.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6345812
  * @summary Validate argument kinds in Types utilities
  * @author  Scott Seligman
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TypesBadArg
  * @compile -processor TypesBadArg -proc:only TypesBadArg.java
  */

--- a/langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6392818
  * @summary Tests Elements.isDeprecated(Element)
  * @author  Joseph D. Darcy
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile TestDeprecation.java
  * @compile -processor TestDeprecation -proc:only Dep1.java

--- a/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug     6346973
  * @summary directSupertypes(t) should not return t
  * @author  Scott Seligman
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor DirectSupersOfErr
  * @compile -processor DirectSupersOfErr -proc:only C1.java
  */

--- a/langtools/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6471577 6517779
  * @summary Test Elements.getConstantExpression
  * @author  Joseph D. Darcy
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestGetConstantExpression
  * @compile -processor TestGetConstantExpression Foo.java
  */

--- a/langtools/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6453386
  * @summary Test Elements.getPackageOf
  * @author  Joseph D. Darcy
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor TestGetPackageOf
  * @compile -processor TestGetPackageOf -proc:only TestGetPackageOf.java
  */

--- a/langtools/test/tools/javac/processing/model/util/filter/TestIterables.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/model/util/filter/TestIterables.java	Fri Dec 21 08:45:43 2012 -0800
@@ -26,7 +26,7 @@
  * @bug 6406164
  * @summary Test that ElementFilter iterable methods behave properly.
  * @author  Joseph D. Darcy
- * @library ../../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor
  * @compile TestIterables.java
  * @compile -processor TestIterables -proc:only Foo1.java

--- a/langtools/test/tools/javac/processing/options/testCommandLineClasses/Test.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/options/testCommandLineClasses/Test.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6930508
  * @summary Passing nested class names on javac command line interfere with subsequent name -> class lookup
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor p.NestedExamples Test
  * @run main Test
  */

--- a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6987384
  * @summary -XprintProcessorRoundsInfo message printed with different timing than previous
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor Test
  * @compile/fail/ref=Test.out -XDrawDiagnostics -XprintProcessorInfo -Werror -proc:only -processor Test Test.java
  */

--- a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6987384
  * @summary -XprintProcessorRoundsInfo message printed with different timing than previous
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor Test TestWithXstdout
  * @run main TestWithXstdout
  */

--- a/langtools/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6986892
  * @summary confusing warning given after errors in annotation processing
- * @library ../../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor TestProcUseImplicitWarning
  * @clean C1 p.C2
  * @compile/fail/ref=err.out -XDrawDiagnostics -processor TestProcUseImplicitWarning -Aerror C1.java

--- a/langtools/test/tools/javac/processing/werror/WError1.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/werror/WError1.java	Fri Dec 21 08:45:43 2012 -0800
@@ -24,7 +24,7 @@
 /*
  * @test 6403456
  * @summary -Werror should work with annotation processing
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile WError1.java
  * @compile -proc:only -processor WError1 WError1.java

--- a/langtools/test/tools/javac/processing/werror/WErrorGen.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/werror/WErrorGen.java	Fri Dec 21 08:45:43 2012 -0800
@@ -24,7 +24,7 @@
 /*
  * @test 6403456
  * @summary -Werror should work with annotation processing
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile WErrorGen.java
  * @compile -proc:only -processor WErrorGen WErrorGen.java

--- a/langtools/test/tools/javac/processing/werror/WErrorLast.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/processing/werror/WErrorLast.java	Fri Dec 21 08:45:43 2012 -0800
@@ -24,7 +24,7 @@
 /*
  * @test 6403456
  * @summary -Werror should work with annotation processing
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build   JavacTestingAbstractProcessor
  * @compile WErrorLast.java
  * @compile -proc:only -processor WErrorLast WErrorLast.java

--- a/langtools/test/tools/javac/resolve/ResolveHarness.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/resolve/ResolveHarness.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 7098660
  * @summary Write better overload resolution/inference tests
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor ResolveHarness
  * @run main ResolveHarness
  */

--- a/langtools/test/tools/javac/util/T6597678.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/util/T6597678.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 6597678 6449184
  * @summary Ensure Messages propogated between rounds
- * @library ../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor T6597678
  * @run main T6597678
  */

--- a/langtools/test/tools/javac/util/context/T7021650.java	Thu Dec 20 17:59:46 2012 +0000
+++ b/langtools/test/tools/javac/util/context/T7021650.java	Fri Dec 21 08:45:43 2012 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 7021650
  * @summary Fix Context issues
- * @library ../../lib
+ * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor T7021650
  * @run main T7021650
  */