From a6240f78c7a25fac174f41a5bebdc972212b57c2 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 18 Feb 2014 14:51:18 +0000
Subject: merge revision(s) r40866:

	* test/ruby/envutil.rb (assert_separately): require envutil in the
	  child process too.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 5 +++++
 test/ruby/envutil.rb | 3 ++-
 version.h            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a035245923..a55a44ab50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 18 23:48:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_separately): require envutil in the
+	  child process too.
+
 Tue Feb 18 22:38:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index b3384234d5..ae9b3d5028 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -1,6 +1,7 @@
 # -*- coding: us-ascii -*-
 require "open3"
 require "timeout"
+require "test/unit"
 
 module EnvUtil
   def rubybin
@@ -279,7 +280,7 @@ module Test
           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
diff --git a/version.h b/version.h
index a2967c8e11..b0543c3b8f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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
-- 
cgit v1.2.1