From 71ab182911602baa7facb1ffc71146ce8d376938 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 13 Dec 2009 11:56:37 +0000
Subject: * test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to  
 reject non-string.

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

diff --git a/ChangeLog b/ChangeLog
index f89e40a85d..edb36542f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 13 20:55:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
+	  reject non-string.
+
 Sun Dec 13 20:26:57 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ruby.c (rb_parser_dump_tree): add prototype.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 0c3fbf9f55..f8ca78a524 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -83,7 +83,7 @@ module EnvUtil
       in_c.close
       out_c.close if capture_stdout
       err_c.close if capture_stderr
-      in_p.write stdin_data
+      in_p.write stdin_data.to_str
       in_p.close
       th_stdout = Thread.new { out_p.read } if capture_stdout
       th_stderr = Thread.new { err_p.read } if capture_stderr
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index ebc10fc650..8352b03979 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -399,7 +399,7 @@ class TestObject < Test::Unit::TestCase
   def test_superclass_method
     bug2312 = '[ruby-dev:39581]'
     assert_in_out_err(["-e", "module Enumerable;undef min;end; (1..2).min{}"],
-                      [], [], /no superclass method/, bug2312)
+                      "", [], /no superclass method/, bug2312)
   end
 
   def test_specific_eval_with_wrong_arguments
diff --git a/test/test_mathn.rb b/test/test_mathn.rb
index d0bf03760d..7083568525 100644
--- a/test/test_mathn.rb
+++ b/test/test_mathn.rb
@@ -4,7 +4,7 @@ require_relative 'ruby/envutil'
 # mathn redefines too much. It must be isolated to child processes.
 class TestMathn < Test::Unit::TestCase
   def test_power
-    assert_in_out_err ['-r', 'mathn', '-e', '1**2'], [], [], [], '[ruby-core:25740]'
-    assert_in_out_err ['-r', 'mathn', '-e', '(1<<126)**2'], [], [], [], '[ruby-core:25740]'
+    assert_in_out_err ['-r', 'mathn', '-e', '1**2'], "", [], [], '[ruby-core:25740]'
+    assert_in_out_err ['-r', 'mathn', '-e', '(1<<126)**2'], "", [], [], '[ruby-core:25740]'
   end
 end
-- 
cgit v1.2.3