usa	2013-03-20 17:52:04 +0900 (Wed, 20 Mar 2013)

  New Revision: 39837

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39837

  Log:
    * test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
      allow using different drive for source and build directories.
      this may fixes a minor problem of r39834.

  Modified files:
    trunk/ChangeLog
    trunk/test/win32ole/test_err_in_callback.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39836)
+++ ChangeLog	(revision 39837)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Mar 20 17:47:53 2013  NAKAMURA Usaku  <usa@r...>
+
+	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
+	  allow using different root for source and build directories.
+	  this may fixes a minor problem of r39834.
+
 Wed Mar 20 16:40:48 2013  Hiroshi Shirosaki  <h.shirosaki@g...>
 
 	* test/ruby/test_signal.rb (test_hup_me): skip if HUP isn't supported.
Index: test/win32ole/test_err_in_callback.rb
===================================================================
--- test/win32ole/test_err_in_callback.rb	(revision 39836)
+++ test/win32ole/test_err_in_callback.rb	(revision 39837)
@@ -20,9 +20,10 @@ if defined?(WIN32OLE) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_err_in_callback.rb#L20
         @ruby = "." + sep + CONFIG["RUBY_INSTALL_NAME"]
         cwd = Pathname.new(File.expand_path('.'))
         @iopt = $:.map {|e|
-          " -I " + Pathname.new(e).relative_path_from(cwd).to_s
+          " -I " + (Pathname.new(e).relative_path_from(cwd).to_s rescue e)
         }.join("")
-        @script = Pathname.new(File.join(File.dirname(__FILE__), "err_in_callback.rb")).relative_path_from(cwd).to_s
+        script = File.join(File.dirname(__FILE__), "err_in_callback.rb")
+        @script = Pathname.new(script).relative_path_from(cwd).to_s rescue script
       end
     end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/