diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-07-08 08:17:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 08:17:03 +0900 |
| commit | 4b947857236ecdaaf29de0150a9b378cce5136eb (patch) | |
| tree | 0585b29051f1c763ab9ec188a532776d6b845379 | |
| parent | 7e463c7279314c8bf6bb6f36dc56444ea0f9a7a3 (diff) | |
| parent | 1e31f59231d7d31dc58a1e07f228897ddd4b4d7b (diff) | |
| download | json-4b947857236ecdaaf29de0150a9b378cce5136eb.tar.gz | |
Merge pull request #436 from kares/green-ci
[test] properly 'skip' test on JRuby
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tests/json_generator_test.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a287523..78b19dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/tests/json_generator_test.rb b/tests/json_generator_test.rb index ee19fa5..028f82f 100644 --- a/tests/json_generator_test.rb +++ b/tests/json_generator_test.rb @@ -49,7 +49,6 @@ EOT end def test_remove_const_segv - return if RUBY_ENGINE == 'jruby' stress = GC.stress const = JSON::SAFE_STATE_PROTOTYPE.dup @@ -76,7 +75,7 @@ EOT 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) |