diff options
Diffstat (limited to 'spec/ruby/command_line')
-rw-r--r-- | spec/ruby/command_line/dash_v_spec.rb | 9 | ||||
-rw-r--r-- | spec/ruby/command_line/rubyopt_spec.rb | 12 |
2 files changed, 3 insertions, 18 deletions
diff --git a/spec/ruby/command_line/dash_v_spec.rb b/spec/ruby/command_line/dash_v_spec.rb index 36e73a2cba..995a46a87f 100644 --- a/spec/ruby/command_line/dash_v_spec.rb +++ b/spec/ruby/command_line/dash_v_spec.rb @@ -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 diff --git a/spec/ruby/command_line/rubyopt_spec.rb b/spec/ruby/command_line/rubyopt_spec.rb index 87a826e254..81a57f97c3 100644 --- a/spec/ruby/command_line/rubyopt_spec.rb +++ b/spec/ruby/command_line/rubyopt_spec.rb @@ -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 |