зеркало из https://github.com/github/ruby.git
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 84e8e2a39bba874433b661bd378165bd03c9d6aa and bfd2f159f0c60ef8ac5bce6042edd25a571769b7.
This commit is contained in:
Родитель
bc96a45f12
Коммит
e4d85d3a2d
29
load.c
29
load.c
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче