diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-09 17:28:14 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-09 17:28:14 +0000 |
| commit | 38117a85b32bdfd8fc96687254fd0b759edaadbf (patch) | |
| tree | b8c7f946ad48493a383a5ba71f888c62a009f7f4 /lib | |
| parent | 9ee867c44f70452c9871c69d4b6f2328d3d5cc70 (diff) | |
merge revision(s) r48854: [Backport #10494]
* test/lib/test/unit.rb: Also rescue EINVAL for older Linux that
raises it in popen. [Bug #10494]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test/unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 13a993fc6c..09036e5b93 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -394,7 +394,7 @@ module Test begin require 'io/console' width = $stdout.winsize[1] - rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF + rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF, Errno::EINVAL width = ENV["COLUMNS"].to_i.nonzero? || 80 end width -= 1 if /mswin|mingw/ =~ RUBY_PLATFORM |