infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8244051: AbsPathsInImage.java still fails on Windows

Browse Source 
Reviewed-by: ihse
This commit is contained in:
Erik Joelsson 2020-04-29 09:26:49 -07:00
parent bef54e0a7e
commit 25e0f4737b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/jdk/build/AbsPathsInImage.java
View File

@ -151,7 +151,7 @@ public class AbsPathsInImage {
return super.visitFile(file, attrs);
} else if (fileName.endsWith(".debuginfo") || fileName.endsWith(".pdb")) {
// Do nothing
} else if (fileName.endsWith("jvm.dll")) {
} else if (fileName.endsWith("jvm.dll") || fileName.endsWith("jpackage.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
@ -168,11 +168,13 @@ public class AbsPathsInImage {
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.incubating.jpackage module
// For the same reason as jvm.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")) {
matches = matches.stream().filter(f -> !f.endsWith("Dll.h")).collect(Collectors.toList());
matches = matches.stream()
.filter(f -> !f.matches(".*jdk\\.incubator\\.jpackage.*\\.h.*"))
.collect(Collectors.toList());
}
if (matches.size() > 0) {
matchFound = true;