summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-12 08:37:54 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-12 08:37:54 +0000
commit6ae7a4fcf6040deb5d22238d649e115c0d47fd71 (patch)
tree00c409ba2825fd6dc16b089d68dd5af14b43a690
parent2efac157b8e70e6be734caefe8a0a823e40ae4a1 (diff)
merge revision(s) 33857,37157:
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
-rw-r--r--test/ruby/test_io.rb3
-rw-r--r--version.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 7da6878..41c296e 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2066,7 +2066,8 @@ End
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
index 8392eeb..b404e16 100644
--- 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