nagachika	2013-03-09 22:02:04 +0900 (Sat, 09 Mar 2013)

  New Revision: 39659

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

  Log:
    merge revision(s) 39375:
    
    test_process.rb: fix parameters
    
    * test/ruby/test_process.rb (test_{,a}spawn_too_long_path): fix
      missing parameters in r38934.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_process.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39658)
+++ ruby_2_0_0/version.h	(revision 39659)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 28
+#define RUBY_PATCHLEVEL 29
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/ruby/test_process.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_process.rb	(revision 39658)
+++ ruby_2_0_0/test/ruby/test_process.rb	(revision 39659)
@@ -1380,15 +1380,15 @@ class TestProcess < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_process.rb#L1380
 
   def test_spawn_too_long_path
     bug4314 = '[ruby-core:34842]'
-    assert_fail_too_long_path(bug4314)
+    assert_fail_too_long_path("a", bug4314)
   end
 
   def test_aspawn_too_long_path
     bug4315 = '[ruby-core:34833]'
-    assert_fail_too_long_path(bug4315)
+    assert_fail_too_long_path("a|", bug4315)
   end
 
-  def assert_fail_too_long_path(cmd, mesg = nil)
+  def assert_fail_too_long_path(cmd, mesg)
     size = 1_000_000 / cmd.size
     exs = [Errno::ENOENT]
     exs << Errno::E2BIG if defined?(Errno::E2BIG)

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39375


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