diff options
| -rw-r--r-- | test/mkmf/test_framework.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_file_exhaustive.rb | 6 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 5 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 49e695fc75..f3845f7f51 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -744,12 +744,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 @@ -1,6 +1,6 @@ #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 |