From c1303fbe8a2bd66913d4f4970920d3182c901b0e Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 17 Feb 2012 03:25:38 +0000 Subject: [PATCH] merge revision(s) 34255: [Backport #6035] * test/readline/test_readline.rb (test_completion_proc_empty_result): rescue NoMemoryError. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/readline/test_readline.rb | 6 +++--- version.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 5ae106768b..c5188ad5c6 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -207,10 +207,10 @@ class TestReadline < Test::Unit::TestCase with_temp_stdio do |stdin, stdout| stdin.write("first\t") stdin.flush - actual_text = nil Readline.completion_proc = ->(text) {[]} - line = replace_stdio(stdin.path, stdout.path) { - Readline.readline("> ") + line = nil + replace_stdio(stdin.path, stdout.path) { + assert_nothing_raised(NoMemoryError) {line = Readline.readline("> ")} } assert_equal("first", line) end diff --git a/version.h b/version.h index 2e810f7827..8db74093b0 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 130 +#define RUBY_PATCHLEVEL 131 #define RUBY_RELEASE_DATE "2012-02-17" #define RUBY_RELEASE_YEAR 2012