Merge
authorjjg
Fri, 20 Jan 2017 18:24:50 -0800
changeset 43278 e9f4ee9bfd86
parent 43277 edf2836a33f7 (diff)
parent 43276 0f8dd574fa0a (current diff)
child 43279 9afb33b0a3ab
Merge
--- a/langtools/test/tools/javac/classreader/FileSystemClosedTest.java	Fri Jan 20 19:12:30 2017 +0000
+++ b/langtools/test/tools/javac/classreader/FileSystemClosedTest.java	Fri Jan 20 18:24:50 2017 -0800
@@ -68,7 +68,7 @@
         JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
         PrintWriter out = new PrintWriter(System.err, true);
         StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
-        List<String> options = Arrays.asList("-classpath", jar.toString());
+        List<String> options = Arrays.asList("-classpath", jar.toString(), "-proc:none");
         Iterable<? extends JavaFileObject> files = fm.getJavaFileObjects(src.resolve("C.java"));
         com.sun.source.util.JavacTask task =
                 (com.sun.source.util.JavacTask) comp.getTask(out, fm, null, options, null, files);
@@ -92,7 +92,7 @@
             TypeElement p2C2 = elems.getTypeElement("p2.C2");
             System.err.println("p2: " + p2 + ";  p2C2: " + p2C2);
             if (p2C2 != null) {
-                throw new Exception("p1.C1 found unexpectedly");
+                throw new Exception("p2.C2 found unexpectedly");
             }
         } catch (ClosedFileSystemException e) {
             throw new Exception("unexpected exception thrown", e);