3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 38bde0de91..e723502bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul  3 19:28:51 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
+	  ignore Errno::ENOENT on unlinking.  [Bug #11060]
+
 Fri Jul  3 18:40:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 44bcfc6343..6e62bb2352 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -691,7 +691,7 @@ class TestRequire < Test::Unit::TestCase
   def test_loading_fifo_threading
     Tempfile.create(%w'fifo .rb') {|f|
       f.close
-      File.unlink(f.path)
+      File.unlink(f.path) rescue nil
       File.mkfifo(f.path)
       assert_separately(["-", f.path], <<-END, timeout: 3)
       th = Thread.current
diff --git a/version.h b/version.h
index 79821f055c..fe64c44005 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-07-03"
-#define RUBY_PATCHLEVEL 375
+#define RUBY_PATCHLEVEL 376
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 7