summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 7da6878829..41c296e3b6 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 8392eeb761..b404e164d6 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