summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <[email protected]>2025-04-02 13:38:49 +0900
committerHiroshi SHIBATA <[email protected]>2025-04-02 16:24:47 +0900
commit6bd5a51ab5a2b1d33fa586cb2969b25d8d68c121 (patch)
treea9bc14d06c1108fc5e29698a80f4fb38a42b18fa
parentca97302dd404070bf971767914b6e4855b4de8a9 (diff)
Removed Solaris conditions from test files
We no longer execute those files with Solaris platforms.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/13037
-rw-r--r--test/dtrace/helper.rb6
-rw-r--r--test/fileutils/test_fileutils.rb2
-rw-r--r--test/io/console/test_io_console.rb8
-rw-r--r--test/ruby/test_fiber.rb2
-rw-r--r--test/ruby/test_process.rb6
-rw-r--r--test/rubygems/test_gem_bundler_version_finder.rb2
-rw-r--r--test/socket/test_socket.rb2
7 files changed, 7 insertions, 21 deletions
diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index 7fa16965f1..9e8c7ecd52 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -65,11 +65,7 @@ module DTrace
class TestCase < Test::Unit::TestCase
INCLUDE = File.expand_path('..', File.dirname(__FILE__))
- case RUBY_PLATFORM
- when /solaris/i
- # increase bufsize to 8m (default 4m on Solaris)
- DTRACE_CMD = %w[dtrace -b 8m]
- when /darwin/i
+ if RUBY_PLATFORM =~ /darwin/i
READ_PROBES = proc do |cmd|
lines = nil
PTY.spawn(*cmd) do |io, _, pid|
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index d2096a04cc..1d7be692f5 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -1349,7 +1349,7 @@ class TestFileUtils < Test::Unit::TestCase
# regular file. It's slightly strange. Anyway it's no effect bit.
# see /usr/src/sys/ufs/ufs/ufs_chmod()
# 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'
assert_filemode 07500, 'tmp/a'
chmod "a-t,a-s", 'tmp/a'
diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
index 709ea53a88..519184c537 100644
--- a/test/io/console/test_io_console.rb
+++ b/test/io/console/test_io_console.rb
@@ -20,17 +20,13 @@ class TestIO_Console < Test::Unit::TestCase
# FreeBSD seems to hang on TTOU when running parallel tests
# 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.
# (Parallel mode runs tests in child processes, so I guess
# they has no TTY.)
# But it does not occur in `make test-all > /dev/null`, so
# there should be an additional factor, I guess.
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
def set_winsize_teardown
@@ -408,7 +404,7 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do
if cc = ctrl["intr"]
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
if cc = ctrl["dsusp"]
assert_ctrl("#{cc.ord}", cc, r, w)
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index b1defdf82c..1f78307748 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -49,7 +49,7 @@ class TestFiber < Test::Unit::TestCase
end
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
@cnt = 0
(1..100).map{|ti|
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 5a91e94b09..b65e34fe09 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1758,9 +1758,6 @@ class TestProcess < Test::Unit::TestCase
end
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|
Dir.mkdir("vd")
status = nil
@@ -1800,9 +1797,6 @@ class TestProcess < Test::Unit::TestCase
end
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'
assert_fail_too_long_path(%w"echo |", bug4315)
end
diff --git a/test/rubygems/test_gem_bundler_version_finder.rb b/test/rubygems/test_gem_bundler_version_finder.rb
index b72670b802..39255bc4e1 100644
--- a/test/rubygems/test_gem_bundler_version_finder.rb
+++ b/test/rubygems/test_gem_bundler_version_finder.rb
@@ -82,7 +82,7 @@ class TestGemBundlerVersionFinder < Gem::TestCase
def test_deleted_directory
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"
orig_dir = Dir.pwd
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index b15cf63297..165990dd64 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -513,7 +513,7 @@ class TestSocket < Test::Unit::TestCase
end
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)
t1 = Time.now.strftime("%Y-%m-%d")
stamp = nil