kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use Etc.uname instead of uname command invocation.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-05-18 08:45:37 +00:00
parent 0b373d6bbb
commit bd4fdb714f
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/ruby/test_io.rb
View file

@ -1673,14 +1673,14 @@ class TestIO < Test::Unit::TestCase
when 0x9123683E # BTRFS_SUPER_MAGIC
when 0x7461636f # OCFS2_SUPER_MAGIC
when 0xEF53 # EXT2_SUPER_MAGIC EXT3_SUPER_MAGIC EXT4_SUPER_MAGIC
return false if (`/bin/uname -r`.split('.').map(&:to_i) <=> [3,8]) < 0
return false if (Etc.uname[:release].split('.').map(&:to_i) <=> [3,8]) < 0
# ext3's timestamp resolution is seconds
s = f.stat
s.mtime.nsec != 0 || s.atime.nsec != 0 || s.ctime.nsec != 0
when 0x58465342 # XFS_SUPER_MAGIC
return false if (`/bin/uname -r`.split('.').map(&:to_i) <=> [3,5]) < 0
return false if (Etc.uname[:release].split('.').map(&:to_i) <=> [3,5]) < 0
when 0x01021994 # TMPFS_MAGIC
return false if (`/bin/uname -r`.split('.').map(&:to_i) <=> [3,8]) < 0
return false if (Etc.uname[:release].split('.').map(&:to_i) <=> [3,8]) < 0
else
return false
end

3
test/ruby/test_sleep.rb
View file

@ -1,4 +1,5 @@
require 'test/unit'
require 'etc'
class TestSleep < Test::Unit::TestCase
def test_sleep_5sec
@ -9,7 +10,7 @@ class TestSleep < Test::Unit::TestCase
bottom =
case RUBY_PLATFORM
when /linux/
4.98 if /Linux ([\d.]+)/ =~ `uname -sr` && ($1.split('.').map(&:to_i)<=>[2,6,18])<1
4.98 if (Etc.uname[:release].split('.').map(&:to_i)<=>[2,6,18]) <= 0
when /mswin|mingw/
4.98
end

3
test/socket/test_socket.rb
View file

@ -2,6 +2,7 @@ begin
require "socket"
require "tmpdir"
require "fcntl"
require "etc"
require "test/unit"
rescue LoadError
end
@ -332,7 +333,7 @@ class TestSocket < Test::Unit::TestCase
case RUBY_PLATFORM
when /linux/
if ai.ip_address.include?('%') and
(`uname -r`[/[0-9.]+/].split('.').map(&:to_i) <=> [2,6,18]) <= 0
(Etc.uname[:release][/[0-9.]+/].split('.').map(&:to_i) <=> [2,6,18]) <= 0
# Cent OS 5.6 (2.6.18-238.19.1.el5xen) doesn't correctly work
# sendmsg with pktinfo for link-local ipv6 addresses
next true