Skip to content

Commit

Permalink
Tests pass against IronRuby 1.0 with .Net Framework 4 - includes a fi…
Browse files Browse the repository at this point in the history
…x for whitespace issue with mspec
  • Loading branch information
thbar committed Apr 17, 2010
1 parent fd51bcd commit 4daa9d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ desc "Home-baked spec task"
task :spec do
# this obviously need some cleaning - it's currently getting the job done though
if RUBY_PLATFORM == 'i386-mswin32'
ENV["RUBY_EXE"] = 'C:\git\ironruby\Merlin\Main\Bin\debug\ir.exe'
system("ir spec/mspec/bin/mspec-run --format spec spec/*_spec.rb")
else
unless ENV["RUBY_EXE"]
Expand Down
6 changes: 4 additions & 2 deletions spec/mspec/lib/mspec/helpers/ruby_exe.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Note - this version has been patched until I move Magic to RSpec

require 'mspec/utils/ruby_name'
require 'mspec/guards/guard'

Expand Down Expand Up @@ -92,8 +94,8 @@ def ruby_exe_options(option)
def resolve_ruby_exe
[:env, :engine, :name, :install_name].each do |option|
next unless cmd = ruby_exe_options(option)
exe = cmd.split.first

exe = cmd#.split.first #-> IronRuby is installed in a folder with spaces by default - things messed up here
# It has been reported that File.executable is not reliable
# on Windows platforms (see commit 56bc555c). So, we check the
# platform.
Expand Down

0 comments on commit 4daa9d7

Please sign in to comment.