# HG changeset patch
# User jjg
# Date 1407970078 25200
# Node ID 3f96599b20daf5511ae4b496030790fe2636ecf0
# Parent  0768f194cad1437b42e3ebbf414e3cc954031abf
8055076: fix test failures in classfile tests
Reviewed-by: darcy

diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner annotation.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerAnnotationTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner class.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerClassTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner enum.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerEnumTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner interface.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerInterfaceTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Test that inner classes have in its inner classes attribute enclosing classes and its immediate members.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesHierarchyTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner classes in anonymous class.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInAnonymousClassTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner annotation.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerAnnotationTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8034854 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner class.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerClassTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8034854 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner enum.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerEnumTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner interface.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerInterfaceTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner classes in local class.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInLocalClassTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Test that outer_class_info_index of local and anonymous class is zero.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerClassesIndexTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8034854 8042251
  * @summary Testing inner classes attributes.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerClassesTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner annotation.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumInInnerAnnotationTest
  */
@@ -46,4 +46,4 @@
         setOuterClassType(ClassType.ANNOTATION);
         setInnerClassType(ClassType.ENUM);
     }
-}
\ No newline at end of file
+}
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner enum.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumInInnerEnumTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner interface.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumInInnerInterfaceTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner class.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumsInInnerClassTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner interfaces in inner annotation.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerAnnotationTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Testing InnerClasses_attribute of inner interfaces in inner class.
  * @author aeremeev
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerClassTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner interfaces in inner enum.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerEnumTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner interfaces in inner interface.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerInterfaceTest
  */
diff -r 0768f194cad1 -r 3f96599b20da langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java	Wed Aug 13 21:58:29 2014 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java	Wed Aug 13 15:47:58 2014 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8042251
  * @summary Test that there are no inner classes attributes in case of there are no inner classes.
- * @library /tools/javac/lib ../lib
+ * @library /tools/lib /tools/javac/lib ../lib
  * @build TestBase InMemoryFileManager ToolBox
  * @run main NoInnerClassesTest
  */