From bd4fdb714ff6cf3d42d5a7e6597e83cbe4de65b8 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 18 May 2014 08:45:37 +0000
Subject: Use Etc.uname instead of uname command invocation.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_io.rb       | 6 +++---
 test/ruby/test_sleep.rb    | 3 ++-
 test/socket/test_socket.rb | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 9d89772d99..1324a2c2fa 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -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
diff --git a/test/ruby/test_sleep.rb b/test/ruby/test_sleep.rb
index 82c7e0ff49..a2e50739fb 100644
--- a/test/ruby/test_sleep.rb
+++ b/test/ruby/test_sleep.rb
@@ -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
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index 73801811e1..c11b90995e 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -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
-- 
cgit v1.2.3