nagachika	2018-03-04 07:04:49 +0900 (Sun, 04 Mar 2018)

  New Revision: 62646

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62646

  Log:
    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]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/test/mkmf/test_framework.rb
    branches/ruby_2_4/test/ruby/test_file_exhaustive.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 62645)
+++ ruby_2_4/version.h	(revision 62646)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.4"
 #define RUBY_RELEASE_DATE "2018-03-04"
-#define RUBY_PATCHLEVEL 246
+#define RUBY_PATCHLEVEL 247
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/test/mkmf/test_framework.rb
===================================================================
--- ruby_2_4/test/mkmf/test_framework.rb	(revision 62645)
+++ ruby_2_4/test/mkmf/test_framework.rb	(revision 62646)
@@ -22,11 +22,11 @@ class TestMkmf https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/mkmf/test_framework.rb#L22
     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
Index: ruby_2_4/test/ruby/test_file_exhaustive.rb
===================================================================
--- ruby_2_4/test/ruby/test_file_exhaustive.rb	(revision 62645)
+++ ruby_2_4/test/ruby/test_file_exhaustive.rb	(revision 62646)
@@ -744,12 +744,14 @@ class TestFileExhaustive < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_file_exhaustive.rb#L744
     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
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 62645)
+++ ruby_2_4	(revision 62646)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r58431,58447

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/