usa	2015-07-03 21:55:15 +0900 (Fri, 03 Jul 2015)

  New Revision: 51128

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

  Log:
    * test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
      fix previous commit.  [Bug #11060]

  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_require.rb
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 51127)
+++ ruby_2_1/ChangeLog	(revision 51128)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Jul  3 21:54:46 2015  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
+	  fix previous commit.  [Bug #11060]
+
 Fri Jul  3 19:28:51 2015  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
Index: ruby_2_1/test/ruby/test_require.rb
===================================================================
--- ruby_2_1/test/ruby/test_require.rb	(revision 51127)
+++ ruby_2_1/test/ruby/test_require.rb	(revision 51128)
@@ -691,7 +691,7 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_require.rb#L691
   def test_loading_fifo_threading
     Tempfile.create(%w'fifo .rb') {|f|
       f.close
-      File.unlink(f.path) rescue nil
+      File.unlink(f.path)
       File.mkfifo(f.path)
       assert_separately(["-", f.path], <<-END, timeout: 3)
       th = Thread.current
@@ -699,5 +699,6 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_require.rb#L699
       assert_raise(IOError) {load(ARGV[0])}
       END
     }
+  rescue Errno::ENOENT
   end unless /mswin|mingw/ =~ RUBY_PLATFORM
 end

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