summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_require.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e65b3055a..a46f63ecfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 28 16:30:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * test/ruby/test_require.rb (TestRequire#test_require_too_long_filename):
+ Added -w option because too long path error don't output a message
+ by default since r30660. [Bug #4336] [ruby-dev:43134]
+
Fri Jan 28 16:19:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2}):
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index f9cda4ea44..c764939b1e 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -29,10 +29,10 @@ class TestRequire < Test::Unit::TestCase
INPUT
begin
- assert_in_out_err(["-S", "foo/" * 2500 + "foo"], "") do |r, e|
+ assert_in_out_err(["-S", "-w", "foo/" * 2500 + "foo"], "") do |r, e|
assert_equal([], r)
assert_operator(2, :<=, e.size)
- assert_equal("openpath: pathname too long (ignored)", e.first)
+ assert_match(/warning: openpath: pathname too long \(ignored\)/, e.first)
assert_match(/\(LoadError\)/, e.last)
end
rescue Errno::EINVAL