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

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
This commit is contained in:
usa 2018-03-18 14:34:17 +00:00
parent 1521768c2c
commit 685061590b
4 changed files with 24 additions and 5 deletions

View file

@ -1,3 +1,20 @@
Sun Mar 18 23:31:44 2018 Nobuyoshi Nakada <nobu@ruby-lang.org>
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.
[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.
[Bug #13489]
Sun Mar 18 23:29:14 2018 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_word.rb: word quit without confirmation dialog to

View file

@ -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

View file

@ -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

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-03-18"
#define RUBY_PATCHLEVEL 414
#define RUBY_PATCHLEVEL 415
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3