diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/win32ole/test_err_in_callback.rb | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -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. 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 |