summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-09 13:02:04 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-09 13:02:04 +0000
commit2cec010eec8710ba33774ab4b1d182ce5547c761 (patch)
tree8a15d1bee4d1a7da33a4fdbc3b7673527d23e7a0
parent7737f3ec6651973a5afbb187aa71204c64a6aef1 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_process.rb6
-rw-r--r--version.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 6616955502..9ee7bdfd93 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1380,15 +1380,15 @@ class TestProcess < Test::Unit::TestCase
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)
diff --git a/version.h b/version.h
index 0b3988beb8..d9fe31c4d6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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