diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-05-02 19:42:57 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-05-18 10:02:42 +0900 |
| commit | 2e291e3ffdea1cba747119ff58cf253f4c4a87c8 (patch) | |
| tree | ac8024cb8e7d92295c259ef4cecf1e5ccc09ea94 /test/rubygems/helper.rb | |
| parent | 8ba584ff3c085251865c11c5d7deef0ddfc6d0ff (diff) | |
Merge RubyGems-3.3.12 and Bundler-2.3.12
Diffstat (limited to 'test/rubygems/helper.rb')
| -rw-r--r-- | test/rubygems/helper.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb index be9016b831..946a792854 100644 --- a/test/rubygems/helper.rb +++ b/test/rubygems/helper.rb @@ -1098,13 +1098,12 @@ Also, a list: Zlib::Deflate.deflate data end - def util_set_RUBY_VERSION(version, patchlevel = nil, revision = nil, description = nil, engine = "ruby", engine_version = nil) + def util_set_RUBY_VERSION(version, revision = nil, description = nil, engine = "ruby", engine_version = nil) if Gem.instance_variables.include? :@ruby_version Gem.send :remove_instance_variable, :@ruby_version end @RUBY_VERSION = RUBY_VERSION - @RUBY_PATCHLEVEL = RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL) @RUBY_REVISION = RUBY_REVISION if defined?(RUBY_REVISION) @RUBY_DESCRIPTION = RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION) @RUBY_ENGINE = RUBY_ENGINE @@ -1113,7 +1112,6 @@ Also, a list: util_clear_RUBY_VERSION Object.const_set :RUBY_VERSION, version - Object.const_set :RUBY_PATCHLEVEL, patchlevel if patchlevel Object.const_set :RUBY_REVISION, revision if revision Object.const_set :RUBY_DESCRIPTION, description if description Object.const_set :RUBY_ENGINE, engine @@ -1124,8 +1122,6 @@ Also, a list: util_clear_RUBY_VERSION Object.const_set :RUBY_VERSION, @RUBY_VERSION - Object.const_set :RUBY_PATCHLEVEL, @RUBY_PATCHLEVEL if - defined?(@RUBY_PATCHLEVEL) Object.const_set :RUBY_REVISION, @RUBY_REVISION if defined?(@RUBY_REVISION) Object.const_set :RUBY_DESCRIPTION, @RUBY_DESCRIPTION if @@ -1137,7 +1133,6 @@ Also, a list: def util_clear_RUBY_VERSION Object.send :remove_const, :RUBY_VERSION - Object.send :remove_const, :RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL) Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION) Object.send :remove_const, :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION) Object.send :remove_const, :RUBY_ENGINE |