From 0a88cb504baf9d4c483de63b7efa33d58ff4bdcc Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 27 Oct 2008 03:13:54 +0000
Subject: [PATCH] * test/ruby/envutil.rb: reverted the changeset 19948 because
 it   concealed unexpected behaviours of ruby.

* test/ruby/test_io.rb: ditto.

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

diff --git a/ChangeLog b/ChangeLog
index c468d0448d..e5d709be50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Oct 27 12:04:58 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/envutil.rb: reverted the changeset 19948 because it
+	  concealed unexpected behaviours of ruby.
+
+	* test/ruby/test_io.rb: ditto.
+
 Mon Oct 27 12:02:53 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* ext/nkf/nkf.c (rb_nkf_convert): should specify type of variable.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 22901ea99b..4aba8a0bde 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -122,7 +122,7 @@ module Test
         c = "C"
         env = {}
         LANG_ENVS.each {|lc| env[lc], ENV[lc] = ENV[lc], c}
-        pid = spawn(EnvUtil.rubybin, "--disable-gems", *args, STDIN=>in_c, STDOUT=>out_c, STDERR=>err_c)
+        pid = spawn(EnvUtil.rubybin, *args, STDIN=>in_c, STDOUT=>out_c, STDERR=>err_c)
         in_c.close
         out_c.close
         err_c.close
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 2b6810e055..4d9bb51fe3 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -581,7 +581,7 @@ class TestIO < Test::Unit::TestCase
   def ruby(*args)
     args = ['-e', '$>.write($<.read)'] if args.empty?
     ruby = EnvUtil.rubybin
-    f = IO.popen([ruby, "--disable-gems"] + args, 'r+')
+    f = IO.popen([ruby] + args, 'r+')
     yield(f)
   ensure
     f.close unless !f || f.closed?