summaryrefslogtreecommitdiff
path: root/test/ruby
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-25 08:49:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-25 08:49:08 +0000
commitc689ee1a89feb9d5acebb7a6092aef23af3cf35b (patch)
tree07805b36cc318388001956c681a8d37d3c09f4ec /test/ruby
parentd6ab828369b8ab6995b47abd9ab5982618c2d334 (diff)
* io.c (argf_eof): should not have reached EOF before trying to
read. based on a patch by Heesob Park <phasis AT gmail.com> at [ruby-core:24559]. [ruby-core:24557] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/test_argf.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index a6c224b..c00db99 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -72,7 +72,7 @@ class TestArgf < Test::Unit::TestCase
p [a.gets.chomp, a.lineno, b.gets.chomp, b.lineno] #=> ["5", 5, "5", 8]
p [a.gets.chomp, a.lineno, b.gets.chomp, b.lineno] #=> ["6", 6, "6", 9]
SRC
- expected = src.scan(/\#=> *(.*+)/).flatten
+ expected = src.scan(/\#=> *(.+)/).flatten
ruby('-e', src, @t1.path, @t2.path, @t3.path) do |f|
f.each_with_index do |a, i|
assert_equal(expected.shift, a.chomp, "[ruby-dev:34445]: line #{i}")
@@ -102,7 +102,7 @@ class TestArgf < Test::Unit::TestCase
a.gets; p $. #=> 2001
a.gets; p $. #=> 2001
SRC
- expected = src.scan(/\#=> *(.*+)/).join(",")
+ expected = src.scan(/\#=> *(.+)/).join(",")
ruby('-e', src, @t1.path, @t2.path, @t3.path) do |f|
assert_equal(expected, f.read.chomp.gsub("\n", ","))
end
@@ -125,7 +125,7 @@ class TestArgf < Test::Unit::TestCase
a.gets; p $. #=> 2000
a.gets; p $. #=> 2000
SRC
- expected = src.scan(/\#=> *(.*+)/).join(",")
+ expected = src.scan(/\#=> *(.+)/).join(",")
ruby('-e', src, @t1.path, @t2.path, @t3.path) do |f|
assert_equal(expected, f.read.chomp.gsub("\n", ","))
end
@@ -433,7 +433,7 @@ class TestArgf < Test::Unit::TestCase
end
SRC
a = f.read.split("\n")
- ((%w(true false) * 4).take(7) + %w(end)).each do |x|
+ (%w(false) + (%w(false true) * 3) + %w(end)).each do |x|
assert_equal(x, a.shift)
end
end