stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8063074: test/tools/javac/plugin/showType/Test.java fails on Windows

Browse Source 
Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2014-11-05 19:48:42 -08:00
parent a75d2dbd39
commit c4f3406133
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/test/tools/javac/plugin/showtype/Test.java
View File

@ -85,7 +85,7 @@ public class Test {
.run(); .run();
File plugin = new File(pluginClasses.getPath(), "META-INF/services/com.sun.source.util.Plugin"); File plugin = new File(pluginClasses.getPath(), "META-INF/services/com.sun.source.util.Plugin");
tb.writeFile(plugin.getPath(),"ShowTypePlugin"); tb.writeFile(plugin.getPath(), "ShowTypePlugin\n");
tb.new JarTask() tb.new JarTask()
.run("cf", pluginJar.getPath(), "-C", pluginClasses.getPath(), "."); .run("cf", pluginJar.getPath(), "-C", pluginClasses.getPath(), ".");

6
langtools/test/tools/lib/ToolBox.java
View File

@ -1475,7 +1475,11 @@ public class ToolBox {
@Override @Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
try { try {
JarEntry e = new JarEntry(base.relativize(file).normalize().toString()); String p = base.relativize(file)
.normalize()
.toString()
.replace(File.separatorChar, '/');
JarEntry e = new JarEntry(p);
jos.putNextEntry(e); jos.putNextEntry(e);
jos.write(Files.readAllBytes(file)); jos.write(Files.readAllBytes(file));
jos.closeEntry(); jos.closeEntry();