akr	2009-12-13 20:56:37 +0900 (Sun, 13 Dec 2009)

  New Revision: 26071

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26071

  Log:
    * test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
      reject non-string.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/envutil.rb
    trunk/test/ruby/test_object.rb
    trunk/test/test_mathn.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26070)
+++ ChangeLog	(revision 26071)
@@ -1,3 +1,8 @@
+Sun Dec 13 20:55:30 2009  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* ruby.c (rb_parser_dump_tree): add prototype.
Index: test/ruby/test_object.rb
===================================================================
--- test/ruby/test_object.rb	(revision 26070)
+++ test/ruby/test_object.rb	(revision 26071)
@@ -399,7 +399,7 @@
   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
Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 26070)
+++ test/ruby/envutil.rb	(revision 26071)
@@ -83,7 +83,7 @@
       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
Index: test/test_mathn.rb
===================================================================
--- test/test_mathn.rb	(revision 26070)
+++ test/test_mathn.rb	(revision 26071)
@@ -4,7 +4,7 @@
 # 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/