Use locateFile in the dynamic module loader #18382
Merged
Conversation
This file contains 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
georgestagg
force-pushed
the
dylink_locate_file
branch
3 times, most recently
from
c4b5fdf to
4a3e598
Compare
sbc100
reviewed
Dec 15, 2022
test/test_core.py
Outdated
| @needs_dylink | ||
| def test_dylink_locate_file(self): | ||
| name = 'liblib.so' | ||
| with tempfile.TemporaryDirectory() as tmpdir: |
There was a problem hiding this comment.
I don't think there is any need to use a random tmpdir here.
How about just doing:`
so_dir = 'so_dir'
os.makedir(so_dir)
Each test already runs inside its own temporary sandbox directory anyway
There was a problem hiding this comment.
Sounds good to me. I was trying to clean up after myself but I can see now that tests run in a tmpdir anyway.
georgestagg
force-pushed
the
dylink_locate_file
branch
from
4a3e598 to
6481a95
Compare
Make the expected error in test_dlfcn_missing more general to support the addition of using `locateFile` in `loadLibData`.
georgestagg
force-pushed
the
dylink_locate_file
branch
from
6481a95 to
8c80559
Compare
sbc100
approved these changes
Dec 15, 2022
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.
With this change, in
loadLibDatathe path tolibFileis passed throughlocateFilebefore attempting to download the data from an external source. Fixes #14502.A test for dynamic linking with
locateFileis added that creates theliblib.soside module in a temporary directory rather than in the current directory, as default. The side module is linked by passing the full file path toliblib.so, andlocateFileis then used to tell Emscripten at runtime where to find the file. The test only passes when the dynamic module loader is indeed able to uselocateFileto find the side module for loading.