merge revision(s) 33857,37157:

unak · unak · commit 6ae7a4fcf604 · 2012-10-12T08:37:54.000Z
Run the test only if /dev/tty exists.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
@@ -2066,7 +2066,8 @@ def test_ioctl_linux
 
   def test_ioctl_linux2
     return if /linux/ !~ RUBY_PLATFORM
-    return if /^i?86|^x86_64/ !~ RUBY_PLATFORM
+    return if /^i.?86|^x86_64/ !~ RUBY_PLATFORM
+    return unless File.exist?('/dev/tty')
 
     File.open('/dev/tty') { |f|
       tiocgwinsz=0x5413
diff --git a/version.h b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 283
+#define RUBY_PATCHLEVEL 284
 
 #define RUBY_RELEASE_DATE "2012-10-12"
 #define RUBY_RELEASE_YEAR 2012
