summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 12:45:32 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 12:45:32 +0000
commitd80452a1839d89e8f1ef80fefba5d7b48fc9df16 (patch)
tree1f39fcf35e50e1be5d05a329ab2e3b3ccaaaa79a /test
parent243faf286f072f0c45d353e03effc0a531e5df52 (diff)
merges r30147 from trunk into ruby_1_9_2.
-- * test/irb/test_option.rb (test_end_of_option): don't read .irbrc. Bug#4138 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/irb/test_option.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/irb/test_option.rb b/test/irb/test_option.rb
index 846d7185a5..5e29803bb6 100644
--- a/test/irb/test_option.rb
+++ b/test/irb/test_option.rb
@@ -5,7 +5,7 @@ module TestIRB
class TestOption < Test::Unit::TestCase
def test_end_of_option
bug4117 = '[ruby-core:33574]'
- status = assert_in_out_err(%w[-rirb -e IRB.start(__FILE__) -- --], "", //, [], bug4117)
+ status = assert_in_out_err(%w[-rirb -e IRB.start(__FILE__) -- -f --], "", //, [], bug4117)
assert(status.success?, bug4117)
end
end