From 0dddb4b32895e46c31bbad363bafc5a5bfcd7c45 Mon Sep 17 00:00:00 2001 From: kosaki Date: Fri, 25 Jan 2013 17:15:05 +0000 Subject: [PATCH] * test/ruby/test_io.rb (test_ioctl_linux): skip if a platform is not x86 because linux ioctl request number depend on cpu arch. At least, alpha, mips, sparc and ppc have a different number. [Bug #7718] [ruby-core:51544] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/ruby/test_io.rb | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 038d1372a7..574b64c443 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jan 26 01:12:23 2013 KOSAKI Motohiro + + * test/ruby/test_io.rb (test_ioctl_linux): skip if a platform is + not x86 because linux ioctl request number depend on cpu arch. + At least, alpha, mips, sparc and ppc have a different number. + [Bug #7718] [ruby-core:51544] + Fri Jan 25 19:14:24 2013 Masaki Suketa * ext/win32ole/win32ole.c: use TlsAlloc instead of __declspec(thread) diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 0b3b5591e3..451f6c246d 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2439,11 +2439,14 @@ End def test_ioctl_linux return if /linux/ !~ RUBY_PLATFORM + # Alpha, mips, sparc and ppc have an another ioctl request number scheme. + # So, hardcoded 0x80045200 may fail. + return if /^i.?86|^x86_64/ !~ RUBY_PLATFORM assert_nothing_raised do File.open('/dev/urandom'){|f1| entropy_count = "" - # get entropy count + # RNDGETENTCNT(0x80045200) mean "get entropy count". f1.ioctl(0x80045200, entropy_count) } end