[GR-32195] Fix resource inclusion on Windows. #3498
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
olpaw
approved these changes
Jun 21, 2021
|
@jperedadnr can you test if this fix solves the Windows issue that you reported recently? |
| @@ -252,13 +253,16 @@ private static void scanDirectory(DebugContext debugContext, File root, Pattern[ | |||
| Map<String, List<String>> matchedDirectoryResources = new HashMap<>(); | |||
| Set<String> allEntries = new HashSet<>(); | |||
| ArrayList<File> queue = new ArrayList<>(); | |||
| String separator = FileSystems.getDefault().getSeparator(); | |||
There was a problem hiding this comment.
There is a simpler way to write this without defining a new variable. File.separator is a system-dependent variable with the same value.
graalvmbot
force-pushed
the
github/gradinac/GR-32195-windows-resources
branch
from
8cfbb20 to
429b04e
Compare
|
I've tested successfully this patch, the three tests reported in #3336 that were failing now pass. |
graalvmbot
force-pushed
the
github/gradinac/GR-32195-windows-resources
branch
from
429b04e to
b451eb5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, resources don't work as expected on Windows as we don't properly include resources in the image. The core reason for this failure is passing platform specific file paths to our resource inclusion pattern matcher. This PR addresses that by replacing the platform specific file separator in that path with "/"
Closes #3496