usa	2012-02-14 15:45:33 +0900 (Tue, 14 Feb 2012)

  New Revision: 34591

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

  Log:
    merge revision(s) 34395:
    
    * test/irb/test_completion.rb: skip if cannot load irb/completion
      (maybe readline does not exist).

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/irb/test_completion.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34590)
+++ ruby_1_9_3/ChangeLog	(revision 34591)
@@ -1,3 +1,8 @@
+Tue Feb 14 15:44:42 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/irb/test_completion.rb: skip if cannot load irb/completion
+	  (maybe readline does not exist).
+
 Tue Feb 14 15:07:23 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/test/unit/assertions.rb (build_message): skip escaped
Index: ruby_1_9_3/test/irb/test_completion.rb
===================================================================
--- ruby_1_9_3/test/irb/test_completion.rb	(revision 34590)
+++ ruby_1_9_3/test/irb/test_completion.rb	(revision 34591)
@@ -4,14 +4,19 @@
 module TestIRB
   class TestCompletion < Test::Unit::TestCase
     def test_nonstring_module_name
-      bug5938 = '[ruby-core:42244]'
-      cmds = %W[-rirb -rirb/completion -e IRB.setup(__FILE__)
-       -e IRB.conf[:MAIN_CONTEXT]=IRB::Irb.new.context
-       -e module\sFoo;def\sself.name;//;end;end
-       -e IRB::InputCompletor::CompletionProc.call("[1].first.")
-       -- -f --]
-      status = assert_in_out_err(cmds, "", //, [], bug5938)
-      assert(status.success?, bug5938)
+      begin
+        require "irb/completion"
+        bug5938 = '[ruby-core:42244]'
+        cmds = %W[-rirb -rirb/completion -e IRB.setup(__FILE__)
+         -e IRB.conf[:MAIN_CONTEXT]=IRB::Irb.new.context
+         -e module\sFoo;def\sself.name;//;end;end
+         -e IRB::InputCompletor::CompletionProc.call("[1].first.")
+         -- -f --]
+        status = assert_in_out_err(cmds, "", //, [], bug5938)
+        assert(status.success?, bug5938)
+      rescue LoadError
+        skip "cannot load irb/completion"
+      end
     end
   end
 end

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