yugui	2010-12-23 21:45:32 +0900 (Thu, 23 Dec 2010)

  New Revision: 30318

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

  Log:
    merges r30147 from trunk into ruby_1_9_2.
    --
    * test/irb/test_option.rb (test_end_of_option): don't read .irbrc.  Bug#4138

  Modified files:
    branches/ruby_1_9_2/test/irb/test_option.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30317)
+++ ruby_1_9_2/version.h	(revision 30318)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 123
+#define RUBY_PATCHLEVEL 124
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/irb/test_option.rb
===================================================================
--- ruby_1_9_2/test/irb/test_option.rb	(revision 30317)
+++ ruby_1_9_2/test/irb/test_option.rb	(revision 30318)
@@ -5,7 +5,7 @@
   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

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