merge revision(s) 34395:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 18 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f48e654c1..c403cf4531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 14 15:44:42 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/test/unit/assertions.rb (build_message): skip escaped
diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb
index 3c11eb003c..e8baa0d8f5 100644
--- a/test/irb/test_completion.rb
+++ b/test/irb/test_completion.rb
@@ -4,14 +4,19 @@ require_relative '../ruby/envutil'
 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