archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 02:53:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 34255: [Backport #6035]

Browse source 
* 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
This commit is contained in:
naruse 2012-02-17 03:25:38 +00:00
parent 54209dd172
commit c1303fbe8a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/readline/test_readline.rb
View file

@ -207,10 +207,10 @@ class TestReadline < Test::Unit::TestCase
with_temp_stdio do |stdin, stdout| with_temp_stdio do |stdin, stdout|
stdin.write("first\t") stdin.write("first\t")
stdin.flush stdin.flush
actual_text = nil
Readline.completion_proc = ->(text) {[]} Readline.completion_proc = ->(text) {[]}
line = replace_stdio(stdin.path, stdout.path) { line = nil
Readline.readline("> ") replace_stdio(stdin.path, stdout.path) {
assert_nothing_raised(NoMemoryError) {line = Readline.readline("> ")}
} }
assert_equal("first", line) assert_equal("first", line)
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 130 #define RUBY_PATCHLEVEL 131
#define RUBY_RELEASE_DATE "2012-02-17" #define RUBY_RELEASE_DATE "2012-02-17"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012