summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2021-10-04 07:44:51 -0700
committerJeremy Evans <code@jeremyevans.net>2021-10-04 07:43:24 -0900
commit3381fa5458d26fee1a5d109ba65e87212f644ac0 (patch)
treeabd3ebd526cfcae625dd58dcde5adfc57e81acf2
parentd9b7403746249b532ac57ca80112d7e63a417d86 (diff)
Only rescue realpath calls during require on Solaris
Remove temporary skip of test_no_curdir to see if this fixes the problem.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4931
-rw-r--r--load.c2
-rw-r--r--test/ruby/test_process.rb3
2 files changed, 1 insertions, 4 deletions
diff --git a/load.c b/load.c
index 38b26881ce..f0f7ac6cef 100644
--- a/load.c
+++ b/load.c
@@ -1060,7 +1060,7 @@ rb_ext_ractor_safe(bool flag)
GET_THREAD()->ext_config.ractor_safe = flag;
}
-#if 1
+#ifdef __sun
static VALUE
required_feature__realpath(VALUE path)
{
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 98c934945c..07aa58418b 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1732,9 +1732,6 @@ class TestProcess < Test::Unit::TestCase
end
def test_no_curdir
- if /solaris/i =~ RUBY_PLATFORM
- skip "Temporary skip to avoid CI failures after commit to use realpath on required files"
- end
with_tmpchdir {|d|
Dir.mkdir("vd")
status = nil