Require real path #5121
Merged
Require real path #5121
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
expand load paths to real paths to get rid of duplicate loading from symbolic-linked directories. [Feature #10222] ruby/ruby@b6d3927 This fixes test/mri/ruby/test_require.rb#test_symlink_load_path Deletes obsolete spec/regression/GH-1940_symlink_load_path_should_not_expand_in_FILE_spec.rb jruby#5109 jruby#5117
|
Grr...it's still failing. Herre's the error I see...it's a symlinked jar file that should be loaded as a jar file, but because of traversing the link it tries to load as a Ruby file. test: [exec] Java::OrgJrubyEmbed::EvalFailedException: (SyntaxError) /home/travis/build/jruby/jruby/test/jruby/jarwithoutextension:1: Invalid char `\3' ('�') in expression
[exec] PK�;c�7 �META-INF/���PK�PK�;c�7�META-INF/MANIFEST.MF�M��LK-.�
[exec] K-*��ϳR0�3��r.JM,IM�u�� ������+h8���*8��������(x�%�i�r�r�PK�%�tFFPK�/c�7�hello_from_jar.rbS�H���W�UP��T��PK�m!���PK��org.jruby.embed.internal.EmbedEvalUnitImpl.run(org/jruby/embed/internal/EmbedEvalUnitImpl.java:131)
[exec] org.jruby.embed.ScriptingContainer.runUnit(org/jruby/embed/ScriptingContainer.java:1295)
[exec] org.jruby.embed.ScriptingContainer.runScriptlet(org/jruby/embed/ScriptingContainer.java:1288)It is from the JRuby-specific test suite, so maybe it's possible that this is not correct behavior? I believe the issue is that, while it's fine to traverse the link for the file contents, it should still make its decision about what kind of file it is based on the first found filename...maybe? I'm going to let you try to fix it. You can run the one test with |
|
Ping @ChrisBr in case the comment didn't do it :-D |
|
@headius thanks for the heads up! I will have a look at it tonight! |
ChrisBr
added a commit
to ChrisBr/jruby
that referenced
this pull request
Apr 23, 2018
Introduced in jruby#5121. Ruby 2.5 loads now the real path of symlinked libraries. We will now use the file extension of the symlink to decide what ResourceLibrary to load.
ChrisBr
added a commit
to ChrisBr/jruby
that referenced
this pull request
Apr 23, 2018
Introduced in jruby#5121. Ruby 2.5 loads now the real path of symlinked libraries. We will now use the file extension of the symlink to decide what ResourceLibrary to load.
headius
pushed a commit
that referenced
this pull request
Apr 24, 2018
Introduced in #5121. Ruby 2.5 loads now the real path of symlinked libraries. We will now use the file extension of the symlink to decide what ResourceLibrary to load. Signed-off-by: Charles Oliver Nutter <headius@headius.com>
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.
expand load paths to real paths to get rid of duplicate loading from
symbolic-linked directories. [Feature #10222]
ruby/ruby@b6d3927
This fixes
test/mri/ruby/test_require.rb#test_symlink_load_path
Deletes obsolete spec/regression/GH-1940_symlink_load_path_should_not_expand_in_FILE_spec.rb
#5109 #5117