Skip to content

Commit

Permalink
Merge pull request #436 from kares/green-ci
Browse files Browse the repository at this point in the history
[test] properly 'skip' test on JRuby
  • Loading branch information
hsbt committed Jul 7, 2020
2 parents 7e463c7 + 1e31f59 commit 4b94785
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -19,8 +19,6 @@ rvm:
matrix:
allow_failures:
- rvm: ruby-head
- rvm: jruby-9.1
- rvm: jruby-9.2
- rvm: truffleruby
script: "bundle exec rake"
sudo: false
3 changes: 1 addition & 2 deletions tests/json_generator_test.rb
Expand Up @@ -49,7 +49,6 @@ def silence
end

def test_remove_const_segv
return if RUBY_ENGINE == 'jruby'
stress = GC.stress
const = JSON::SAFE_STATE_PROTOTYPE.dup

Expand All @@ -76,7 +75,7 @@ def test_remove_const_segv
silence do
JSON.const_set :SAFE_STATE_PROTOTYPE, const
end
end if JSON.const_defined?("Ext")
end if JSON.const_defined?("Ext") && RUBY_ENGINE != 'jruby'

def test_generate
json = generate(@hash)
Expand Down

0 comments on commit 4b94785

Please sign in to comment.