usa	2012-10-12 17:37:54 +0900 (Fri, 12 Oct 2012)

  New Revision: 37158

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37158

  Log:
    merge revision(s) 33857,37157:
    
    Run the test only if /dev/tty exists.

  Modified files:
    branches/ruby_1_9_3/test/ruby/test_io.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37157)
+++ ruby_1_9_3/version.h	(revision 37158)
@@ -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
Index: ruby_1_9_3/test/ruby/test_io.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_io.rb	(revision 37157)
+++ ruby_1_9_3/test/ruby/test_io.rb	(revision 37158)
@@ -2066,7 +2066,8 @@
 
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/