merge revision(s) 37169: [Backport #7169]

	use tty(1) to check if /dev/tty is usable or not

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 41c296e3b6..074fdee23a 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2067,8 +2067,8 @@ End
   def test_ioctl_linux2
     return if /linux/ !~ RUBY_PLATFORM
     return if /^i.?86|^x86_64/ !~ RUBY_PLATFORM
-    return unless File.exist?('/dev/tty')
 
+    return unless system('tty', '-s') # stdin is not a terminal
     File.open('/dev/tty') { |f|
       tiocgwinsz=0x5413
       winsize=""
diff --git a/version.h b/version.h
index 3f6df3e58a..f8bea27a6a 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 290
+#define RUBY_PATCHLEVEL 291
 
 #define RUBY_RELEASE_DATE "2012-10-16"
 #define RUBY_RELEASE_YEAR 2012