Skip to content
Browse files

* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent f427412 commit dd210d8fbc87dc6473c300822a405c3786b6e60b @unak unak committed Mar 20, 2013
Showing with 9 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +3 −2 test/win32ole/test_err_in_callback.rb
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 20 17:47:53 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@gmail.com>
* test/ruby/test_signal.rb (test_hup_me): skip if HUP isn't supported.
View
5 test/win32ole/test_err_in_callback.rb
@@ -20,9 +20,10 @@ def setup
@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

0 comments on commit dd210d8

Please sign in to comment.
Something went wrong with that request. Please try again.