edit: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/dash_r_spec.rb;C1068248
File: dash_r_spec.rb
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/dash_r_spec.rb;C1068248  (server)    1/27/2010 3:28 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/dash_r_spec.rb;dash_r
@@ -4,7 +4,19 @@
   it "requires the specified file" do
     ["-r fixtures/test_file",
      "-rfixtures/test_file"].each do |o|
-      ruby_exe("fixtures/require.rb", :options => o, :dir => File.dirname(__FILE__)).chomp.should include("fixtures/test_file.rb")
+      ruby_exe("fixtures/require.rb", :options => o, :dir => File.dirname(__FILE__)).should include("fixtures/test_file.rb")
     end
   end
+
+  it "can be specified multiple times" do
+    ruby_exe("fixtures/test_file.rb", :options => "-r fixtures/file -r fixtures/hello", :dir => File.dirname(__FILE__)).should include("file.rb\nHello world")
+  end
+
+  it "can be specified multiple times, but will require the same file just once" do
+    (ruby_exe("fixtures/test_file.rb", :options => "-r fixtures/hello -r fixtures/hello", :dir => File.dirname(__FILE__)) =~ /Hello.*Hello/m).should be_nil
+  end
+
+  it "stops processing remaining files if an exception is thrown" do
+    ruby_exe("fixtures/hello", :options => "-r fixtures/raise", :dir => File.dirname(__FILE__)).should_not include("Hello")
+  end
 end
===================================================================
add: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/fixtures/exit.rb
File: exit.rb
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/fixtures/exit.rb;dash_r
@@ -1,0 +1,2 @@
+puts "Exiting..."
+exit(0)
===================================================================
add: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/fixtures/hello.rb
File: hello.rb
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/fixtures/hello.rb;dash_r
@@ -1,0 +1,1 @@
+puts "Hello world"
===================================================================
add: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/fixtures/raise.rb
File: raise.rb
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/fixtures/raise.rb;dash_r
@@ -1,0 +1,2 @@
+puts "Raising..."
+raise "an exception"
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;C1162930
File: rbconfig.rb
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;C1162930  (server)    1/29/2010 11:56 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;dash_r
@@ -45,7 +45,7 @@
     CONFIG["bindir"] = TOPDIR
     CONFIG["libdir"] = File.expand_path("../External.LCA_RESTRICTED/Languages/Ruby/redist-libs", ENV["MERLIN_ROOT"])
   else
-    TOPDIR = File.dirname(__FILE__) + '/../../'
+    TOPDIR = File.expand_path("../..", File.dirname(__FILE__))
     CONFIG["bindir"] = TOPDIR + "/bin"
     CONFIG["libdir"] = TOPDIR + "/lib"
   end
===================================================================