aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-14 12:27:31 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-14 12:27:31 +0000
commitdc5eb8970c109a82978468a1becfd90094f5df12 (patch)
tree8f91cc52db8607465e2d53aa2eb07bef5848299f
parentf82f5216ac5eee518ee59fbdaa49de862c6a60fd (diff)
downloadruby-dc5eb8970c109a82978468a1becfd90094f5df12.tar.gz
* test/ruby/test_require.rb (test_require_too_long_filename):
increase path length, because MAXPATHLEN is defined as 4096 on linux. * test/ruby/test_require.rb (test_require_path_home_1): ditto. * test/ruby/test_require.rb (test_require_path_home_2): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--test/ruby/test_require.rb6
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 79e749dddd..5a7f888758 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Mar 14 21:20:44 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * test/ruby/test_require.rb (test_require_too_long_filename):
+ increase path length, because MAXPATHLEN is defined as 4096 on linux.
+
+ * test/ruby/test_require.rb (test_require_path_home_1): ditto.
+
+ * test/ruby/test_require.rb (test_require_path_home_2): ditto.
+
Mon Mar 14 19:54:37 2011 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_x509cert.c: parenthesize macro arguments.
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index d19dddea0f..d2ee9df30c 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -29,7 +29,7 @@ class TestRequire < Test::Unit::TestCase
INPUT
begin
- assert_in_out_err(["-S", "-w", "foo/" * 1000 + "foo"], "") do |r, e|
+ assert_in_out_err(["-S", "-w", "foo/" * 1024 + "foo"], "") do |r, e|
assert_equal([], r)
assert_operator(2, :<=, e.size)
assert_match(/warning: openpath: pathname too long \(ignored\)/, e.first)
@@ -51,7 +51,7 @@ class TestRequire < Test::Unit::TestCase
pathname_too_long = /pathname too long \(ignored\).*\(LoadError\)/m
ENV["RUBYPATH"] = "~"
- ENV["HOME"] = "/foo" * 1000
+ ENV["HOME"] = "/foo" * 1024
assert_in_out_err(%w(-S -w test_ruby_test_require), "", [], pathname_too_long)
ensure
@@ -63,7 +63,7 @@ class TestRequire < Test::Unit::TestCase
env_rubypath, env_home = ENV["RUBYPATH"], ENV["HOME"]
pathname_too_long = /pathname too long \(ignored\).*\(LoadError\)/m
- ENV["RUBYPATH"] = "~" + "/foo" * 1000
+ ENV["RUBYPATH"] = "~" + "/foo" * 1024
ENV["HOME"] = "/foo"
assert_in_out_err(%w(-S -w test_ruby_test_require), "", [], pathname_too_long)