Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Tests pass against IronRuby 1.0 with .Net Framework 4 - includes a fi…

…x for whitespace issue with mspec
  • Loading branch information...
commit 4daa9d72d5507b102c9add65bcf82f8c1a203191 1 parent fd51bcd
@thbar authored
Showing with 4 additions and 3 deletions.
  1. +0 −1  Rakefile
  2. +4 −2 spec/mspec/lib/mspec/helpers/ruby_exe.rb
View
1  Rakefile
@@ -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"]
View
6 spec/mspec/lib/mspec/helpers/ruby_exe.rb
@@ -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'
@@ -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.
Please sign in to comment.
Something went wrong with that request. Please try again.