summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-19 15:46:49 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-19 15:46:49 +0000
commitaeecc27f842a93aedcc0177c2eae738a7c87c821 (patch)
tree9c850e71f71f6696acec89b37f85b7e4306ebc5b /test
parentb4fa32f3f3b71b97e8669ee6c18f026ac6e5f5ea (diff)
merge revision(s) r42176:
fix warning: shadowing outer local variable - path git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_require.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 3434957df3..1fc6596a1d 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -74,12 +74,12 @@ class TestRequire < Test::Unit::TestCase
assert_separately(%w[--disable=gems], <<-INPUT)
# leave paths for require encoding objects
bug = "#{bug8165} require #{encoding} path"
- path = "#{require_path}"
+ require_path = "#{require_path}"
enc_path = Regexp.new(Regexp.escape(RUBY_PLATFORM))
$:.replace([IO::NULL] + $:.reject {|path| enc_path !~ path})
assert_nothing_raised(LoadError, bug) {
- assert(require(path), bug)
- assert(!require(path), bug)
+ assert(require(require_path), bug)
+ assert(!require(require_path), bug)
}
INPUT
}