From d81591607172afe8c92e6de72f7fa515aaa3d0bf Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 25 Mar 2011 02:50:17 +0000 Subject: * test/ruby/test_process.rb (TestProcess#test_no_curdir): skip silently on Windows, because this tests a platform specific feature and it'll never be supported on ruby on Windows. * test/ruby/test_dir_m17n.rb (TestDir_M17N#test_filename_extutf8_invalid, TestDir_M17N#test_filename_as_bytes_extutf8): ditto. * test/open-uri/test_open-uri.rb (TestOpenURI#test_find_proxy_case_sensitive_env): ditto. * test/dl/test_handle.rb (DL::TestHandle#test_NEXT, DL::TestHandle#test_DEFAULT): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 16 ++++++++++++++++ test/dl/test_handle.rb | 5 ++--- test/open-uri/test_open-uri.rb | 3 +-- test/ruby/test_dir_m17n.rb | 29 +++++++++++++++-------------- test/ruby/test_process.rb | 5 +---- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c3ca74365..923366ca6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Fri Mar 25 11:49:29 2011 NAKAMURA Usaku + + * test/ruby/test_process.rb (TestProcess#test_no_curdir): skip silently + on Windows, because this tests a platform specific feature and it'll + never be supported on ruby on Windows. + + * test/ruby/test_dir_m17n.rb + (TestDir_M17N#test_filename_extutf8_invalid, + TestDir_M17N#test_filename_as_bytes_extutf8): ditto. + + * test/open-uri/test_open-uri.rb + (TestOpenURI#test_find_proxy_case_sensitive_env): ditto. + + * test/dl/test_handle.rb (DL::TestHandle#test_NEXT, + DL::TestHandle#test_DEFAULT): ditto. + Thu Mar 24 23:06:29 2011 Nobuyoshi Nakada * vm_insnhelper.c (vm_get_ev_const): should not autoload in diff --git a/test/dl/test_handle.rb b/test/dl/test_handle.rb index 75edb10534..3f423925d9 100644 --- a/test/dl/test_handle.rb +++ b/test/dl/test_handle.rb @@ -133,7 +133,6 @@ module DL end def test_NEXT - skip "DL::Handle::NEXT is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM begin # Linux / Darwin # @@ -163,12 +162,12 @@ module DL handle = DL::Handle::NEXT assert_not_nil handle['Init_objspace'] end - end + end unless /mswin|mingw/ =~ RUBY_PLATFORM def test_DEFAULT skip "DL::Handle::DEFAULT is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM handle = DL::Handle::DEFAULT assert_not_nil handle['malloc'] - end + end unless /mswin|mingw/ =~ RUBY_PLATFORM end end diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb index 14f08ffd98..5f501d16cc 100644 --- a/test/open-uri/test_open-uri.rb +++ b/test/open-uri/test_open-uri.rb @@ -522,7 +522,6 @@ class TestOpenURI < Test::Unit::TestCase end def test_find_proxy_case_sensitive_env - skip "environment variable name is not case sensitive on Windows" if RUBY_PLATFORM =~ /mswin|mingw/ with_env('http_proxy'=>'http://127.0.0.1:8080', 'REQUEST_METHOD'=>'GET') { assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy) } @@ -532,7 +531,7 @@ class TestOpenURI < Test::Unit::TestCase with_env('http_proxy'=>'http://127.0.0.1:8080', 'HTTP_PROXY'=>'http://127.0.0.1:8081', 'REQUEST_METHOD'=>'GET') { assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy) } - end + end unless RUBY_PLATFORM =~ /mswin|mingw/ def test_ftp_invalid_request assert_raise(ArgumentError) { URI("ftp://127.0.0.1/").read } diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index 81accb7f93..6701e0b1a5 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -26,7 +26,6 @@ class TestDir_M17N < Test::Unit::TestCase end def test_filename_extutf8_invalid - skip "ruby on windows doesn't support invalid utf-8 path" if /mswin|mingw/ =~ RUBY_PLATFORM with_tmpdir {|d| assert_ruby_status(%w[-EASCII-8BIT], <<-'EOS', nil, :chdir=>d) filename = "\xff".force_encoding("ASCII-8BIT") # invalid byte sequence as UTF-8 @@ -43,7 +42,7 @@ class TestDir_M17N < Test::Unit::TestCase exit ents.include?(filename) || ((RUBY_PLATFORM =~ /darwin/) != nil && ents.include?("%FF")) EOS } - end + end unless /mswin|mingw/ =~ RUBY_PLATFORM def test_filename_as_bytes_extutf8 with_tmpdir {|d| @@ -67,18 +66,20 @@ class TestDir_M17N < Test::Unit::TestCase exit false end EOS - skip "no meaning test on windows" if /mswin|mingw/ =~ RUBY_PLATFORM - assert_ruby_status(%w[-EUTF-8], <<-'EOS', nil, :chdir=>d) - filename1 = "\xc2\xa1".force_encoding("utf-8") - filename2 = "\xc2\xa1".force_encoding("euc-jp") - filename3 = filename1.encode("euc-jp") - filename4 = filename2.encode("utf-8") - s1 = File.stat(filename1) rescue nil - s2 = File.stat(filename2) rescue nil - s3 = File.stat(filename3) rescue nil - s4 = File.stat(filename4) rescue nil - exit((s1 && s2 && !s3 && !s4) ? true : false) - EOS + # no meaning test on windows + unless /mswin|mingw/ =~ RUBY_PLATFORM + assert_ruby_status(%w[-EUTF-8], <<-'EOS', nil, :chdir=>d) + filename1 = "\xc2\xa1".force_encoding("utf-8") + filename2 = "\xc2\xa1".force_encoding("euc-jp") + filename3 = filename1.encode("euc-jp") + filename4 = filename2.encode("utf-8") + s1 = File.stat(filename1) rescue nil + s2 = File.stat(filename2) rescue nil + s3 = File.stat(filename3) rescue nil + s4 = File.stat(filename4) rescue nil + exit((s1 && s2 && !s3 && !s4) ? true : false) + EOS + end } end diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 39c8b18966..de1dcd0bd6 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1209,9 +1209,6 @@ class TestProcess < Test::Unit::TestCase end def test_no_curdir - if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM - skip "removing current directory is not supported" - end with_tmpchdir {|d| Dir.mkdir("vd") status = nil @@ -1224,7 +1221,7 @@ class TestProcess < Test::Unit::TestCase } assert(status.success?, "[ruby-dev:38105]") } - end + end unless /mswin|bccwin|mingw/ =~ RUBY_PLATFORM def test_fallback_to_sh feature = '[ruby-core:32745]' -- cgit v1.2.3