naruse	2012-02-17 12:25:38 +0900 (Fri, 17 Feb 2012)

  New Revision: 34657

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

  Log:
    merge revision(s) 34255: [Backport #6035]
    
    * test/readline/test_readline.rb (test_completion_proc_empty_result): rescue NoMemoryError.

  Modified files:
    branches/ruby_1_9_3/test/readline/test_readline.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34656)
+++ ruby_1_9_3/version.h	(revision 34657)
@@ -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
Index: ruby_1_9_3/test/readline/test_readline.rb
===================================================================
--- ruby_1_9_3/test/readline/test_readline.rb	(revision 34656)
+++ ruby_1_9_3/test/readline/test_readline.rb	(revision 34657)
@@ -207,10 +207,10 @@
     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

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