Add mspec -t x19 to run Rubinius in 1.9 mode

rubinius · Jul 5, 2011 · a98546a · a98546a
1 parent 2930de0
commit a98546a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/mspec/lib/mspec/commands/mspec.rb b/mspec/lib/mspec/commands/mspec.rb
@@ -163,7 +163,9 @@ def run
         more = ["--args", config[:target]] + argv
         exec "gdb", *more
       else
-        exec config[:target], *argv
+        cmd, *rest = config[:target].split(/\s+/)
+        argv = rest + argv unless rest.empty?
+        exec cmd, *argv
       end
     end
   end

diff --git a/mspec/lib/mspec/helpers/ruby_exe.rb b/mspec/lib/mspec/helpers/ruby_exe.rb
@@ -73,7 +73,11 @@ def ruby_exe_options(option)
     when :engine
       case RUBY_NAME
       when 'rbx'
-        "bin/rbx"
+        if Rubinius.ruby19?
+          "bin/rbx -X19"
+        else
+          "bin/rbx"
+        end
       when 'jruby'
         "bin/jruby"
       when 'maglev'

diff --git a/mspec/lib/mspec/utils/options.rb b/mspec/lib/mspec/utils/options.rb
@@ -215,6 +215,8 @@ def targets
         config[:target] = 'ruby1.9'
       when 'x', 'rubinius'
         config[:target] = './bin/rbx'
+      when 'x19', 'rubinius19'
+        config[:target] = './bin/rbx -X19'
       when 'X', 'rbx'
         config[:target] = 'rbx'
       when 'j', 'jruby'