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

Reviewed-by: mikael, ihse
openjdk · May 20, 2020 · 822ec45 · 822ec45
1 parent 3802524
commit 822ec45
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/test/jdk/build/AbsPathsInImage.java b/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")) {