nagachika	2014-02-18 23:51:18 +0900 (Tue, 18 Feb 2014)

  New Revision: 45038

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

  Log:
    merge revision(s) r40866:
    
    * test/ruby/envutil.rb (assert_separately): require envutil in the
      child process too.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/ruby/envutil.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45037)
+++ ruby_2_0_0/ChangeLog	(revision 45038)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Feb 18 23:48:03 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/ruby/envutil.rb (assert_separately): require envutil in the
+	  child process too.
+
 Tue Feb 18 22:38:01 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45037)
+++ ruby_2_0_0/version.h	(revision 45038)
@@ -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 "2014-02-18"
-#define RUBY_PATCHLEVEL 434
+#define RUBY_PATCHLEVEL 435
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_0_0/test/ruby/envutil.rb
===================================================================
--- ruby_2_0_0/test/ruby/envutil.rb	(revision 45037)
+++ ruby_2_0_0/test/ruby/envutil.rb	(revision 45038)
@@ -1,6 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/envutil.rb#L1
 # -*- coding: us-ascii -*-
 require "open3"
 require "timeout"
+require "test/unit"
 
 module EnvUtil
   def rubybin
@@ -279,7 +280,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/envutil.rb#L280
           line ||= loc.lineno
         end
         src = <<eom
-  require 'test/unit';include Test::Unit::Assertions;begin;#{src}
+  require #{__dir__.dump}'/envutil';include Test::Unit::Assertions;begin;#{src}
   ensure
     puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}"
   end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40866


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