OpenJDK / portola / portola
changeset 48458:7a700fd0ad50
8194893: javac -verbose prints wrong paths for output files
Reviewed-by: vromero
author | jjg |
---|---|
date | Thu, 11 Jan 2018 15:06:55 -0800 |
parents | b51755ee57f6 |
children | 7f57c5908c57 |
files | src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java test/langtools/tools/javac/jvm/VerboseOutTest.java |
diffstat | 2 files changed, 67 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jan 11 13:47:11 2018 -0800 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jan 11 15:06:55 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1678,7 +1678,7 @@ try { writeClassFile(out, c); if (verbose) - log.printVerbose("wrote.file", outFile); + log.printVerbose("wrote.file", outFile.getName()); out.close(); out = null; } finally {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/langtools/tools/javac/jvm/VerboseOutTest.java Thu Jan 11 15:06:55 2018 -0800 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8194893 + * @summary javac -verbose prints wrong paths for output files + * @modules jdk.compiler + * @run main VerboseOutTest + */ + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.spi.ToolProvider; + +public class VerboseOutTest { + public static void main(String... args) throws Exception { + new VerboseOutTest().run(); + } + + void run() throws Exception { + String className = getClass().getName(); + Path testSrc = Paths.get(System.getProperty("test.src")); + Path file = testSrc.resolve(className + ".java"); + ToolProvider javac = ToolProvider.findFirst("javac").orElseThrow(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw, true); + int rc = javac.run(pw, pw, + "-d", ".", + "-verbose", + file.toString()); + String log = sw.toString(); + System.out.println(log); + if (rc != 0) { + throw new Exception("compilation failed: rc=" + rc); + } + String expected = "[wrote ./" + className + ".class]"; + if (!log.contains(expected)) { + throw new Exception("expected output not found: " + expected); + } + } +} +