nagachika	2013-03-20 23:17:59 +0900 (Wed, 20 Mar 2013)

  New Revision: 39851

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

  Log:
    merge revision(s) 39809,39834,39837: [Backport #8132]
    
    * test/win32ole/test_err_in_callback.rb
      (TestErrInCallBack#test_err_in_callback): shouldn't create a file in
      source directory.
    
    * test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): use
      relative path to get rid of "too long commandline" error.
      the top of build directory.
    
    * 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.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/win32ole/test_err_in_callback.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39850)
+++ ruby_2_0_0/ChangeLog	(revision 39851)
@@ -1,3 +1,20 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar 20 23:17:33 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 23:17:33 2013  NAKAMURA Usaku  <usa@r...>
+
+	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): use
+	  relative path to get rid of "too long commandline" error.
+
+Wed Mar 20 23:17:33 2013  NAKAMURA Usaku  <usa@r...>
+
+	* test/win32ole/test_err_in_callback.rb
+	  (TestErrInCallBack#test_err_in_callback): shouldn't create a file in
+	  the top of build directory.
+
 Wed Mar 20 23:08:40 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* include/ruby/missing.h: removed __linux__. it's unnecessary.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39850)
+++ ruby_2_0_0/version.h	(revision 39851)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-20"
-#define RUBY_PATCHLEVEL 84
+#define RUBY_PATCHLEVEL 85
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/win32ole/test_err_in_callback.rb
===================================================================
--- ruby_2_0_0/test/win32ole/test_err_in_callback.rb	(revision 39850)
+++ ruby_2_0_0/test/win32ole/test_err_in_callback.rb	(revision 39851)
@@ -9,17 +9,21 @@ rescue LoadError https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/win32ole/test_err_in_callback.rb#L9
 end
 if defined?(WIN32OLE)
   require 'mkmf'
+  require 'pathname'
   require 'test/unit'
+  require 'tmpdir'
   class TestErrInCallBack < Test::Unit::TestCase
     def setup
       @ruby = nil
       if File.exist?("./" + CONFIG["RUBY_INSTALL_NAME"] + CONFIG["EXEEXT"])
         sep = File::ALT_SEPARATOR || "/"
         @ruby = "." + sep + CONFIG["RUBY_INSTALL_NAME"]
+        cwd = Pathname.new(File.expand_path('.'))
         @iopt = $:.map {|e|
-          " -I " + e
+          " -I " + (Pathname.new(e).relative_path_from(cwd).to_s rescue e)
         }.join("")
-        @script = File.join(File.dirname(__FILE__), "err_in_callback.rb")
+        script = File.join(File.dirname(__FILE__), "err_in_callback.rb")
+        @script = Pathname.new(script).relative_path_from(cwd).to_s rescue script
       end
     end
 
@@ -35,18 +39,17 @@ if defined?(WIN32OLE) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/win32ole/test_err_in_callback.rb#L39
     def test_err_in_callback
       skip "'ADODB.Connection' is not available" unless available_adodb?
       if @ruby
-        cmd = "#{@ruby} -v #{@iopt} #{@script} > test_err_in_callback.log 2>&1"
-        system(cmd)
-        str = ""
-        open("test_err_in_callback.log") {|ifs|
-          str = ifs.read
-        }
-        assert_match(/NameError/, str)
+        Dir.mktmpdir do |tmpdir|
+          logfile = File.join(tmpdir, "test_err_in_callback.log")
+          cmd = "#{@ruby} -v #{@iopt} #{@script} > #{logfile.gsub(%r(/), '\\')} 2>&1"
+          result = system(cmd)
+          str = ""
+          open(logfile) {|ifs|
+            str = ifs.read
+          }
+          assert_match(/NameError/, str)
+        end
       end
     end
-
-    def teardown
-      File.unlink("test_err_in_callback.log") if File.exist?("test_err_in_callback.log")
-    end
   end
 end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39809,39834,39837


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