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

Revert rescue around internal realpath call on Solaris

Solaris CI still has a problem even with these commits, so it doesn't
appear to fix the issue.  Reverting both 84e8e2a39b
and bfd2f159f0.
This commit is contained in:
Jeremy Evans 2021-10-04 10:51:29 -07:00
parent bc96a45f12
commit e4d85d3a2d
2 changed files with 4 additions and 28 deletions

29
load.c
View file

@ -1060,33 +1060,6 @@ rb_ext_ractor_safe(bool flag)
GET_THREAD()->ext_config.ractor_safe = flag;
}
#ifdef __sun
static VALUE
required_feature__realpath(VALUE path)
{
return rb_realpath_internal(Qnil, path, 1);
}
static VALUE
required_feature_realpath_rescue(VALUE path, VALUE exc)
{
return path;
}
static VALUE
required_feature_realpath(VALUE path)
{
return rb_rescue(required_feature__realpath, path,
required_feature_realpath_rescue, path);
}
#else
static VALUE
required_feature_realpath(VALUE path)
{
return rb_realpath_internal(Qnil, path, 1);
}
#endif
/*
* returns
* 0: if already loaded (false)
@ -1138,7 +1111,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
result = TAG_RETURN;
}
else if (RTEST(rb_hash_aref(realpaths,
realpath = required_feature_realpath(path)))) {
realpath = rb_realpath_internal(Qnil, path, 1)))) {
result = 0;
}
else {

View file

@ -1732,6 +1732,9 @@ 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