From 52fffdd2c8426e98d3a0198ef4607750732bab93 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Fri, 9 Dec 2022 16:41:26 +0000 Subject: [PATCH] 8298463: tools/javac/modules/EdgeCases.java fails on Windows after JDK-8297988 Reviewed-by: jjg --- test/langtools/tools/javac/modules/EdgeCases.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/langtools/tools/javac/modules/EdgeCases.java b/test/langtools/tools/javac/modules/EdgeCases.java index ae142f32ccd..0262066d7b8 100644 --- a/test/langtools/tools/javac/modules/EdgeCases.java +++ b/test/langtools/tools/javac/modules/EdgeCases.java @@ -39,6 +39,7 @@ import java.io.BufferedWriter; import java.io.Writer; import java.nio.file.Files; +import java.nio.file.FileSystems; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; @@ -1079,6 +1080,7 @@ public class EdgeCases extends ModuleTestBase { tb.createDirectories(classes); record TestCase(Path[] files, String... expectedLog){} + String nameSeparator = FileSystems.getDefault().getSeparator(); TestCase[] testCases = new TestCase[] { new TestCase(new Path[] {m.resolve("module-info.java")}, @@ -1133,7 +1135,9 @@ public class EdgeCases extends ModuleTestBase { } private void record(TaskEvent e, String phase) { JavaFileObject source = e.getSourceFile(); - String sourceName = source != null ? source.getName() : ""; + String sourceName = source != null ? source.getName() + .replace(nameSeparator, "/") + : ""; log.add(e.getKind() + ":" + phase + ":" + sourceName); } });