aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/irb/test_completion.rb21
2 files changed, 18 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a9ac31e58e..0c32856b4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 30 10:38:37 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/irb/test_completion.rb: skip if cannot load irb/completion
+ (maybe readline does not exist).
+
Sun Jan 29 22:47:19 2012 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* tool/config.{guess,sub}: updated to automake-1.11.2.
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