diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 14:34:17 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 14:34:17 +0000 |
| commit | 685061590b2a9bd8d8274e0ae2478d407d4a1ddf (patch) | |
| tree | 7c62adf2dae498677f39659deef5236e68ee13c9 /test | |
| parent | 1521768c2cb352b59aaee061c0ae8e3057c5dc4f (diff) | |
merge revision(s) 58431,58447: [Backport #13489]
test_framework.rb: for case-sensitive filesystem
* test/mkmf/test_framework.rb (test_single_framework): fix header
file name for case-sensitive filesystem. it may not be same as
the framework name, but should be the actual file name.
[ruby-dev:50093] [Bug #13489]
* test/mkmf/test_framework.rb (test_multi_frameworks): ditto.
test_file_exhaustive.rb: check case-sensitive fs
* test/ruby/test_file_exhaustive.rb (test_expand_path): dump
expanded file name, not only appended char, for case-sensitive
filesystem. [ruby-dev:50093] [Bug #13489]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/mkmf/test_framework.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_file_exhaustive.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/mkmf/test_framework.rb b/test/mkmf/test_framework.rb index ae05b0cffc..eb29c6b518 100644 --- a/test/mkmf/test_framework.rb +++ b/test/mkmf/test_framework.rb @@ -22,11 +22,11 @@ class TestMkmf end def test_single_framework - assert(have_framework("Ruby"), mkmflog("try as Objective-C")) + assert(have_framework(%w"Ruby ruby.h"), mkmflog("try as Objective-C")) end def test_multi_frameworks - assert(have_framework("Ruby"), mkmflog("try as Objective-C")) + assert(have_framework(%w"Ruby ruby.h"), mkmflog("try as Objective-C")) create_framework("MkmfTest") do |fw| assert(have_framework(fw), MKMFLOG) end diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index be0a79fdc9..2741a10062 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -725,12 +725,14 @@ class TestFileExhaustive < Test::Unit::TestCase when /darwin/ ["\u{feff}", *"\u{2000}"..."\u{2100}"].each do |c| file = regular_file + c + full_path = File.expand_path(file) + mesg = proc {File.basename(full_path).dump} begin open(file) {} rescue - assert_equal(file, File.expand_path(file), c.dump) + assert_equal(file, full_path, mesg) else - assert_equal(regular_file, File.expand_path(file), c.dump) + assert_equal(regular_file, full_path, mesg) end end end |