From 7836e8ade3444b7c43259138bff5db4bc40986e2 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 17 Dec 2004 15:18:03 +0000
Subject: * test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou. 
  fixed: [ruby-dev:25218]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                      |  5 +++++
 test/readline/test_readline.rb | 28 ++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8445501fe7..fbb43eeade 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 17 18:07:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
+	  fixed: [ruby-dev:25218]
+
 Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: fix bug on setting up system encoding
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index e7093f7bd3..b2c83b4021 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -55,18 +55,22 @@ class TestReadline < Test::Unit::TestCase
   private
 
   def replace_stdio(stdin_path, stdout_path)
-    orig_stdin = STDIN.dup
-    orig_stdout = STDOUT.dup
-    STDIN.reopen(stdin_path, "r")
-    STDOUT.reopen(stdout_path, "w")
-    begin
-      yield
-    ensure
-      STDIN.reopen(orig_stdin)
-      STDOUT.reopen(orig_stdout)
-      orig_stdin.close
-      orig_stdout.close
-    end
+    open(stdin_path, "r"){|stdin|
+      open(stdout_path, "w"){|stdout|
+        orig_stdin = STDIN.dup
+        orig_stdout = STDOUT.dup
+        STDIN.reopen(stdin)
+        STDOUT.reopen(stdout)
+        begin
+          yield
+        ensure
+          STDIN.reopen(orig_stdin)
+          STDOUT.reopen(orig_stdout)
+          orig_stdin.close
+          orig_stdout.close
+        end
+      }
+    }
   end
 end
 
-- 
cgit v1.2.3