From 80db7cc4fe74c20bcc1ea9e7fa7e01cc46ad3ec5 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 20 May 2013 18:08:55 +0000
Subject: [PATCH] envutil.rb: envutil in child

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 5 +++++
 test/ruby/envutil.rb | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f812a3da0b..562e1db5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 21 03:08:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_separately): require envutil in the
+	  child process too.
+
 Tue May 21 03:07:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_conv_enc_opts): should infect.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index c80a5f7da9..ce7226f86d 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
@@ -283,7 +284,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