From 6e15acf4037ae2dc055f8c476aa7829ff62f55f1 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 25 Sep 2016 22:29:16 +0000 Subject: test_dln.rb: fix constants * test/-ext-/win32/test_dln.rb (test_check_imported): use toplevel constants explicitly to get rid of constants under the scope. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/-ext-/win32/test_dln.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/-ext-/win32/test_dln.rb b/test/-ext-/win32/test_dln.rb index a6eedce164..3624346a56 100644 --- a/test/-ext-/win32/test_dln.rb +++ b/test/-ext-/win32/test_dln.rb @@ -8,19 +8,19 @@ module Bug class TestDln < Test::Unit::TestCase def test_check_imported bug = '[Bug #6303]' - so = File.expand_path("../ext/-test-/win32/dln/dlntest.dll", EnvUtil.rubybin) - assert_send([File, :file?, so]) - path = ENV['PATH'] - path = File.dirname(so) + RbConfig::CONFIG["PATH_SEPARATOR"] + path + so = ::File.expand_path("../ext/-test-/win32/dln/dlntest.dll", ::EnvUtil.rubybin) + assert_send([::File, :file?, so]) + path = ::ENV['PATH'] + path = ::File.dirname(so) + ::RbConfig::CONFIG["PATH_SEPARATOR"] + path assert_in_out_err([{'PATH'=>path}, '-r-test-/win32/dln', '-eexit'], '', [], [], bug, timeout: 10) end def test_nonascii_load bug9699 = '[ruby-core:61845] [Bug #9699]' - so = "-test-/dln/empty." + RbConfig::CONFIG["DLEXT"] + so = "-test-/dln/empty." + ::RbConfig::CONFIG["DLEXT"] so = $:.find {|d| d = ::File.join(d, so); break d if ::File.exist?(d)} assert_not_nil(so) - Dir.mkdir(dir = ::File.join(testdir = Dir.mktmpdir("test"), "\u{30c6 30b9 30c8}")) + ::Dir.mkdir(dir = ::File.join(testdir = ::Dir.mktmpdir("test"), "\u{30c6 30b9 30c8}")) ::File.copy_stream(so, ::File.join(dir, ::File.basename(so))) assert_separately(['-', bug9699, testdir, ::File.basename(so)], <<-'end;') bug, dir, so = *ARGV @@ -30,8 +30,8 @@ module Bug end; ensure ::File.unlink(::File.join(dir, ::File.basename(so))) rescue nil - Dir.rmdir(dir) rescue nil - Dir.rmdir(testdir) rescue nil + ::Dir.rmdir(dir) rescue nil + ::Dir.rmdir(testdir) rescue nil end end -- cgit v1.2.3