kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

spec/ruby: revert r63503 and r63508

Browse source 
When RUBY_DESCRIPTION has `+JIT` already, it will be doubled.
Just fake.rb.in always has copied `RUBY_DESCRIPTION`, regardless
MJIT is enabled or not.  `BOOTSTRAPRUBY` is not involved.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-05-29 08:46:36 +00:00
parent d2c6ed6b07
commit 2df80d30fe
2 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spec/ruby/command_line/dash_v_spec.rb
View file

@ -6,14 +6,7 @@ describe "The -v command line option" do
describe "when used alone" do
it "prints version and ends" do
ruby_description =
if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
# fake.rb always drops +JIT from RUBY_DESCRIPTION. This resurrects that.
RUBY_DESCRIPTION.sub(/ \[[^\]]+\]$/, ' +JIT\0')
else
RUBY_DESCRIPTION
end
ruby_exe(nil, args: '-v').include?(ruby_description).should == true
ruby_exe(nil, args: '-v').include?(RUBY_DESCRIPTION).should == true
end
end
end

12
spec/ruby/command_line/rubyopt_spec.rb
View file

@ -22,22 +22,14 @@ describe "Processing RUBYOPT" do
result.should =~ /value of \$DEBUG is true/
end
ruby_description =
if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
# fake.rb always drops +JIT from RUBY_DESCRIPTION. This resurrects that.
RUBY_DESCRIPTION.sub(/ \[[^\]]+\]$/, ' +JIT\0')
else
RUBY_DESCRIPTION
end
it "prints the version number for '-v'" do
ENV["RUBYOPT"] = '-v'
ruby_exe("")[/\A.*/].should == ruby_description
ruby_exe("")[/\A.*/].should == RUBY_DESCRIPTION
end
it "ignores whitespace around the option" do
ENV["RUBYOPT"] = ' -v '
ruby_exe("")[/\A.*/].should == ruby_description
ruby_exe("")[/\A.*/].should == RUBY_DESCRIPTION
end
it "sets $VERBOSE to true for '-w'" do