Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee07ad67c99e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ccd2d59b344d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 4, 2015

  1. skip gem extension test when using jruby-complete

    @mkristian
    mkristian committed Jul 4, 2015
    Copy the full SHA
    d8c3885 View commit details

  2. skip uri-classloader test which fails with -j-ea option when executing

    @mkristian
    mkristian committed Jul 4, 2015
    Copy the full SHA
    ccd2d59 View commit details
Showing with 6 additions and 2 deletions.
  1. +2 −1 test/jruby.1.8.index
  2. +2 −1 test/jruby.1.9.index
  3. +2 −0 test/test_load_gem_extensions.rb
3 changes: 2 additions & 1 deletion test/jruby.1.8.index
View file
Original file line number Diff line number Diff line change
@@ -104,7 +104,8 @@ test_jruby_ext
test_jruby_core_ext
test_thread_context_frame_dereferences_unreachable_variables
test_context_classloader
test_uri_classloader
# fails with -j-ea on java :(
# test_uri_classloader
test_rexml_document
test_load_compiled_ruby
test_openssl_stub
3 changes: 2 additions & 1 deletion test/jruby.1.9.index
View file
Original file line number Diff line number Diff line change
@@ -91,7 +91,8 @@ test_jruby_ext
test_jruby_core_ext
test_thread_context_frame_dereferences_unreachable_variables
test_context_classloader
test_uri_classloader
# fails with -j-ea on java :(
# test_uri_classloader
test_rexml_document
test_load_compiled_ruby
test_openssl_stub
2 changes: 2 additions & 0 deletions test/test_load_gem_extensions.rb
View file
Original file line number Diff line number Diff line change
@@ -19,12 +19,14 @@ def teardown
end

def test_require_extension_file_via_uri_protocol
skipping 'needs jruby-home from filesystem' unless File.exists?('./lib/ruby/shared/json/ext/parser')
require 'uri:file:./lib/ruby/shared/json/ext/parser'
# just check if extension class exists
JSON::Ext::Parser
end

def test_require_extension_file_via_uri_classloader_protocol
skipping 'needs jruby-home from filesystem' unless File.exists?('./lib/ruby/shared/json/ext/parser')
require 'uri:classloader:/lib/ruby/shared/json/ext/generator'
# just check if extension class exists
JSON::Ext::Generator