Skip to content
Permalink
Browse files

8245401: AbsPathsInImage.java fails on Windows on jdwp.dll

Reviewed-by: mikael, ihse
  • Loading branch information
Erik Joelsson
Erik Joelsson committed May 20, 2020
1 parent 3802524 commit 822ec45b027dfc90c4d3ad3acaa0e4e16b4c87a0
Showing with 3 additions and 3 deletions.
  1. +3 −3 test/jdk/build/AbsPathsInImage.java
@@ -151,10 +151,10 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
return super.visitFile(file, attrs);
} else if (fileName.endsWith(".debuginfo") || fileName.endsWith(".pdb")) {
// Do nothing
} else if (fileName.endsWith("jvm.dll") || fileName.endsWith("jpackage.dll")) {
} else if (fileName.endsWith(".dll")) {
// On Windows, the Microsoft toolchain does not provide a way
// to reliably remove all absolute paths from __FILE__ usage.
// Until that is fixed, we simply exclude jvm.dll from this
// Until that is fixed, we simply exclude *.dll from this
// test.
} else if (fileName.endsWith(".zip")) {
scanZipFile(file, searchPatterns);
@@ -168,7 +168,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO

private void scanFile(Path file, List<byte[]> searchPatterns) throws IOException {
List<String> matches = scanBytes(Files.readAllBytes(file), searchPatterns);
// For the same reason as jvm.dll above, the jdk.incubator.jpackage module
// For the same reason as the *.dll above, the jdk.incubator.jpackage module
// contains some unavoidable header references in the launcher which is
// stored as a java resource inside the modules file.
if (IS_WINDOWS && file.toString().endsWith("modules")) {

0 comments on commit 822ec45

Please sign in to comment.
You can’t perform that action at this time.