kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

test_dln.rb: fix constants

Browse source 
* 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
This commit is contained in:
nobu 2016-09-25 22:29:16 +00:00
parent 7f6a2e4a60
commit 5ebce690df
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/-ext-/win32/test_dln.rb
View file

@ -8,19 +8,19 @@ module Bug
class TestDln < Test::Unit::TestCase class TestDln < Test::Unit::TestCase
def test_check_imported def test_check_imported
bug = '[Bug #6303]' bug = '[Bug #6303]'
so = File.expand_path("../ext/-test-/win32/dln/dlntest.dll", EnvUtil.rubybin) so = ::File.expand_path("../ext/-test-/win32/dln/dlntest.dll", ::EnvUtil.rubybin)
assert_send([File, :file?, so]) assert_send([::File, :file?, so])
path = ENV['PATH'] path = ::ENV['PATH']
path = File.dirname(so) + RbConfig::CONFIG["PATH_SEPARATOR"] + path path = ::File.dirname(so) + ::RbConfig::CONFIG["PATH_SEPARATOR"] + path
assert_in_out_err([{'PATH'=>path}, '-r-test-/win32/dln', '-eexit'], '', [], [], bug, timeout: 10) assert_in_out_err([{'PATH'=>path}, '-r-test-/win32/dln', '-eexit'], '', [], [], bug, timeout: 10)
end end
def test_nonascii_load def test_nonascii_load
bug9699 = '[ruby-core:61845] [Bug #9699]' 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)} so = $:.find {|d| d = ::File.join(d, so); break d if ::File.exist?(d)}
assert_not_nil(so) 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))) ::File.copy_stream(so, ::File.join(dir, ::File.basename(so)))
assert_separately(['-', bug9699, testdir, ::File.basename(so)], <<-'end;') assert_separately(['-', bug9699, testdir, ::File.basename(so)], <<-'end;')
bug, dir, so = *ARGV bug, dir, so = *ARGV
@ -30,8 +30,8 @@ module Bug
end; end;
ensure ensure
::File.unlink(::File.join(dir, ::File.basename(so))) rescue nil ::File.unlink(::File.join(dir, ::File.basename(so))) rescue nil
Dir.rmdir(dir) rescue nil ::Dir.rmdir(dir) rescue nil
Dir.rmdir(testdir) rescue nil ::Dir.rmdir(testdir) rescue nil
end end
end end