summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-06 02:30:52 +0000
committershirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-06 02:30:52 +0000
commite4283fd39d9e8c508ce5ee2dc069b6f5545cd3d8 (patch)
tree7851bf68eb0061cebcda1f983258e697ec3b29cf
parent8ee121d060ed7b3191e86c981fe144be2e19953a (diff)
* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
fix load path for encoding to run the test as stand-alone. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_require.rb4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e843ad23c..4e2ef8b73f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 6 11:23:18 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+
+ * test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
+ fix load path for encoding to run the test as stand-alone.
+
Sat Apr 6 09:54:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (NATINT_LEN): fix definition order, must be after
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 2e7b37d138..049f7b1470 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -73,7 +73,9 @@ class TestRequire < Test::Unit::TestCase
open(require_path, "wb") {}
assert_in_out_err([], <<-INPUT, %w(:ok), [], bug8165)
# coding: #{encoding}
- $:.replace([IO::NULL] + $:.reject {|path| path !~ /\.ext/})
+ # leave paths for require encoding objects
+ enc_path = Regexp.new(RUBY_PLATFORM)
+ $:.replace([IO::NULL] + $:.reject {|path| enc_path !~ path})
p :ok if require '#{require_path}'
p :ng if require '#{require_path}'
INPUT