From 5207d9f158485d6f4b96477b4d08c15eaded93c4 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 3 Oct 2014 12:02:49 +0000
Subject: [PATCH] * test/ruby/test_io.rb (TestIO#test_advise): avoid to
 infinite loop.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 4 ++++
 test/ruby/test_io.rb | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3366de63fd..718259e4d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct  3 21:02:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_advise): avoid to infinite loop.
+
 Fri Oct  3 19:26:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* .travis.yml: enabled test results of linux.
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 92f7f6b46f..557ad0897b 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2488,11 +2488,11 @@ End
             ret = assert_nothing_raised(lambda { os_and_fs(tf.path) }) {
               begin
                 t.advise(adv, offset, len)
-              rescue Errno::EINVAL
+              rescue Errno::EINVAL => e
                 if /linux/ =~ RUBY_PLATFORM && (Etc.uname[:release].split('.').map(&:to_i) <=> [3,6]) < 0
                   next # [ruby-core:65355] tmpfs is not supported
                 else
-                  retry
+                  raise e
                 end
               end
             }