1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed Solaris conditions from test files

Browse Source 
We no longer execute those files with Solaris platforms.
This commit is contained in:
Hiroshi SHIBATA 2025-04-02 13:38:49 +09:00
parent ca97302dd4
commit 6bd5a51ab5
Notes: git 2025-04-02 07:25:06 +00:00 
Merged: https://github.com/ruby/ruby/pull/13037
7 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/dtrace/helper.rb
View File

@ -65,11 +65,7 @@ module DTrace
class TestCase < Test::Unit::TestCase class TestCase < Test::Unit::TestCase
INCLUDE = File.expand_path('..', File.dirname(__FILE__)) INCLUDE = File.expand_path('..', File.dirname(__FILE__))
case RUBY_PLATFORM if RUBY_PLATFORM =~ /darwin/i
when /solaris/i
# increase bufsize to 8m (default 4m on Solaris)
DTRACE_CMD = %w[dtrace -b 8m]
when /darwin/i
READ_PROBES = proc do |cmd| READ_PROBES = proc do |cmd|
lines = nil lines = nil
PTY.spawn(*cmd) do |io, _, pid| PTY.spawn(*cmd) do |io, _, pid|

2
test/fileutils/test_fileutils.rb
View File

@ -1349,7 +1349,7 @@ class TestFileUtils < Test::Unit::TestCase
# regular file. It's slightly strange. Anyway it's no effect bit. # regular file. It's slightly strange. Anyway it's no effect bit.
# see /usr/src/sys/ufs/ufs/ufs_chmod() # see /usr/src/sys/ufs/ufs/ufs_chmod()
# NetBSD, OpenBSD, Solaris, and AIX also deny it. # NetBSD, OpenBSD, Solaris, and AIX also deny it.
if /freebsd|netbsd|openbsd|solaris|aix/ !~ RUBY_PLATFORM if /freebsd|netbsd|openbsd|aix/ !~ RUBY_PLATFORM
chmod "u+t,o+t", 'tmp/a' chmod "u+t,o+t", 'tmp/a'
assert_filemode 07500, 'tmp/a' assert_filemode 07500, 'tmp/a'
chmod "a-t,a-s", 'tmp/a' chmod "a-t,a-s", 'tmp/a'

8
test/io/console/test_io_console.rb
View File

@ -20,17 +20,13 @@ class TestIO_Console < Test::Unit::TestCase
# FreeBSD seems to hang on TTOU when running parallel tests # FreeBSD seems to hang on TTOU when running parallel tests
# tested on FreeBSD 11.x. # tested on FreeBSD 11.x.
# #
# Solaris gets stuck too, even in non-parallel mode.
# It occurs only in chkbuild. It does not occur when running
# `make test-all` in SSH terminal.
#
# I suspect that it occurs only when having no TTY. # I suspect that it occurs only when having no TTY.
# (Parallel mode runs tests in child processes, so I guess # (Parallel mode runs tests in child processes, so I guess
# they has no TTY.) # they has no TTY.)
# But it does not occur in `make test-all > /dev/null`, so # But it does not occur in `make test-all > /dev/null`, so
# there should be an additional factor, I guess. # there should be an additional factor, I guess.
def set_winsize_setup def set_winsize_setup
@old_ttou = trap(:TTOU, 'IGNORE') if RUBY_PLATFORM =~ /freebsd|solaris/i @old_ttou = trap(:TTOU, 'IGNORE') if RUBY_PLATFORM =~ /freebsd/i
end end
def set_winsize_teardown def set_winsize_teardown
@ -408,7 +404,7 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do
if cc = ctrl["intr"] if cc = ctrl["intr"]
assert_ctrl("#{cc.ord}", cc, r, w) assert_ctrl("#{cc.ord}", cc, r, w)
assert_ctrl("#{cc.ord}", cc, r, w) assert_ctrl("#{cc.ord}", cc, r, w)
assert_ctrl("Interrupt", cc, r, w) unless /linux|solaris/ =~ RUBY_PLATFORM assert_ctrl("Interrupt", cc, r, w) unless /linux/ =~ RUBY_PLATFORM
end end
if cc = ctrl["dsusp"] if cc = ctrl["dsusp"]
assert_ctrl("#{cc.ord}", cc, r, w) assert_ctrl("#{cc.ord}", cc, r, w)

2
test/ruby/test_fiber.rb
View File

@ -49,7 +49,7 @@ class TestFiber < Test::Unit::TestCase
end end
def test_many_fibers_with_threads def test_many_fibers_with_threads
assert_normal_exit <<-SRC, timeout: (/solaris/i =~ RUBY_PLATFORM ? 1000 : 60) assert_normal_exit <<-SRC, timeout: 60
max = 1000 max = 1000
@cnt = 0 @cnt = 0
(1..100).map{|ti| (1..100).map{|ti|

6
test/ruby/test_process.rb
View File

@ -1758,9 +1758,6 @@ class TestProcess < Test::Unit::TestCase
end end
def test_no_curdir def test_no_curdir
if /solaris/i =~ RUBY_PLATFORM
omit "Temporary omit to avoid CI failures after commit to use realpath on required files"
end
with_tmpchdir {|d| with_tmpchdir {|d|
Dir.mkdir("vd") Dir.mkdir("vd")
status = nil status = nil
@ -1800,9 +1797,6 @@ class TestProcess < Test::Unit::TestCase
end end
def test_aspawn_too_long_path def test_aspawn_too_long_path
if /solaris/i =~ RUBY_PLATFORM && !defined?(Process::RLIMIT_NPROC)
omit "Too exhaustive test on platforms without Process::RLIMIT_NPROC such as Solaris 10"
end
bug4315 = '[ruby-core:34833] #7904 [ruby-core:52628] #11613' bug4315 = '[ruby-core:34833] #7904 [ruby-core:52628] #11613'
assert_fail_too_long_path(%w"echo |", bug4315) assert_fail_too_long_path(%w"echo |", bug4315)
end end

2
test/rubygems/test_gem_bundler_version_finder.rb
View File

@ -82,7 +82,7 @@ class TestGemBundlerVersionFinder < Gem::TestCase
def test_deleted_directory def test_deleted_directory
pend "Cannot perform this test on windows" if Gem.win_platform? pend "Cannot perform this test on windows" if Gem.win_platform?
pend "Cannot perform this test on Solaris" if RUBY_PLATFORM.include?("solaris")
require "tmpdir" require "tmpdir"
orig_dir = Dir.pwd orig_dir = Dir.pwd

2
test/socket/test_socket.rb
View File

@ -513,7 +513,7 @@ class TestSocket < Test::Unit::TestCase
end end
def test_timestamp def test_timestamp
return if /linux|freebsd|netbsd|openbsd|solaris|darwin/ !~ RUBY_PLATFORM return if /linux|freebsd|netbsd|openbsd|darwin/ !~ RUBY_PLATFORM
return if !defined?(Socket::AncillaryData) || !defined?(Socket::SO_TIMESTAMP) return if !defined?(Socket::AncillaryData) || !defined?(Socket::SO_TIMESTAMP)
t1 = Time.now.strftime("%Y-%m-%d") t1 = Time.now.strftime("%Y-%m-%d")
stamp = nil stamp = nil