Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removed obsolete -X19 cruft from MSpec.
  • Loading branch information
brixen committed Mar 13, 2016
1 parent 74aa26c commit 69dd9ad
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 37 deletions.
6 changes: 1 addition & 5 deletions mspec/lib/mspec/helpers/ruby_exe.rb
Expand Up @@ -77,11 +77,7 @@ def ruby_exe_options(option)
when :engine
case RUBY_NAME
when 'rbx'
if SpecGuard.ruby_version < "1.9"
"bin/rbx"
else
"bin/rbx -X19"
end
"bin/rbx"
when 'jruby'
"bin/jruby"
when 'maglev'
Expand Down
8 changes: 0 additions & 8 deletions mspec/lib/mspec/utils/options.rb
Expand Up @@ -211,16 +211,8 @@ def targets
case t
when 'r', 'ruby'
config[:target] = 'ruby'
when 'r19', 'ruby19'
config[:target] = 'ruby1.9'
when 'x', 'rubinius'
config[:target] = './bin/rbx'
when 'x18', 'rubinius18'
config[:target] = './bin/rbx -X18'
when 'x19', 'rubinius19'
config[:target] = './bin/rbx -X19'
when 'x20', 'rubinius20'
config[:target] = './bin/rbx -X20'
when 'X', 'rbx'
config[:target] = 'rbx'
when 'j', 'jruby'
Expand Down
24 changes: 0 additions & 24 deletions mspec/spec/helpers/ruby_exe_spec.rb
Expand Up @@ -63,30 +63,6 @@ class RubyExeSpecs
name = File.join RbConfig::CONFIG['bindir'], bin
@script.ruby_exe_options(:install_name).should == name
end

describe "under Rubinius" do
before :each do
@ruby_version = RUBY_VERSION
end

after :each do
Object.const_set :RUBY_VERSION, @ruby_version
end

it "returns 'bin/rbx' when passed :engine, RUBY_NAME is 'rbx' and RUBY_VERSION < 1.9" do
Object.const_set :RUBY_VERSION, "1.8.7"
Object.const_set :RUBY_NAME, 'rbx'

@script.ruby_exe_options(:engine).should == 'bin/rbx'
end

it "returns 'bin/rbx -X19' when passed :engine, RUBY_NAME is 'rbx' and RUBY_VERSION >= 1.9" do
Object.const_set :RUBY_VERSION, "1.9.2"
Object.const_set :RUBY_NAME, 'rbx'

@script.ruby_exe_options(:engine).should == 'bin/rbx -X19'
end
end
end

describe "#resolve_ruby_exe" do
Expand Down

0 comments on commit 69dd9ad

Please sign in to comment.