diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-02-02 20:23:57 +0900 |
|---|---|---|
| committer | NARUSE, Yui <nurse@users.noreply.github.com> | 2021-02-02 21:30:08 +0900 |
| commit | 6673b60f3d86e7431a2ae7b4af7249a01d20f71c (patch) | |
| tree | 7bf48391d72b0390ebbf619737631dd4b695dc4c /test/rubygems | |
| parent | cc51cfabfd0592dd49d4a8ad4bc78e0520128e72 (diff) | |
Merge RubyGems-3.1.7
Diffstat (limited to 'test/rubygems')
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_stream_ui.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 4ce7e92442..5652d86331 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -821,6 +821,8 @@ gem 'other', version assert !File.exist?(system_path), 'plugin written incorrect written to system plugins_dir' assert File.exist?(build_root_path), 'plugin not written to build_root' + + refute_includes File.read(build_root_path), build_root end def test_keeps_plugins_up_to_date diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb index ca6dbc6a8b..a62e9ea0cf 100644 --- a/test/rubygems/test_gem_stream_ui.rb +++ b/test/rubygems/test_gem_stream_ui.rb @@ -5,7 +5,7 @@ require 'timeout' class TestGemStreamUI < Gem::TestCase # increase timeout with MJIT for --jit-wait testing - mjit_enabled = defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? + mjit_enabled = defined?(RubyVM::JIT) ? RubyVM::JIT.enabled? : defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? SHORT_TIMEOUT = (RUBY_ENGINE == "ruby" && !mjit_enabled) ? 0.1 : 1.0 module IsTty |