summaryrefslogtreecommitdiff
path: root/test/win32ole
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-20 08:52:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-20 08:52:04 +0000
commitdd210d8fbc87dc6473c300822a405c3786b6e60b (patch)
tree3e86c4323d9a408c91959d6f71512a64d059df02 /test/win32ole
parentf4274129eefc8f8c2d9c688e93ef692310268d83 (diff)
* 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
Diffstat (limited to 'test/win32ole')
-rw-r--r--test/win32ole/test_err_in_callback.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index 9a43008..d39ea12 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -20,9 +20,10 @@ if defined?(WIN32OLE)
@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