summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-12 01:33:19 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-12 01:33:19 +0000
commit525d2102fcc625435598729e8c972c147eefd24f (patch)
treebc86a8dfd650e0ab61fde21551f6af0274e47864
parenta062d71b15e0a5408cf52516706e8095ed3de69b (diff)
Consider more block devices.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_file_exhaustive.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 2664f95ba9..54b3244eba 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -160,11 +160,7 @@ class TestFileExhaustive < Test::Unit::TestCase
def blockdev
return @blockdev if defined? @blockdev
if /linux/ =~ RUBY_PLATFORM
- if File.exist? '/dev/loop0'
- @blockdev = '/dev/loop0'
- elsif File.exist? '/dev/sda'
- @blockdev = '/dev/sda'
- end
+ @blockdev = %w[/dev/loop0 /dev/sda /dev/vda /dev/xvda1].find {|f| File.exist? f }
else
@blockdev = nil
end