From dd210d8fbc87dc6473c300822a405c3786b6e60b Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 20 Mar 2013 08:52:04 +0000 Subject: * 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 --- test/win32ole/test_err_in_callback.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/win32ole') diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb index 9a430089fb..d39ea12c54 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 -- cgit v1.2.3