diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-07-31 14:32:43 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-07-31 14:32:43 +0000 |
commit | 09b8eddcf238d795b96f15d21adcc6d9d51f7d71 (patch) | |
tree | 8846332e51e9f9a52417ce9647fad09b29049432 /ruby.c | |
parent | 9e4ab409b50dfef68a97b36f2ec50e344c9980ac (diff) |
merge revision(s) b165bedcbd41d791a85fc1ce90b57a0d0525f319,ac00bdc8a8ac2c62a94dd36a7784d15bbcb7df19: [Backport #15821]
skip a test to pass CIs.
I'm debugging [Bug #15821] but my patch introduces another issue.
So I simply skip this test and re-enable it later.
Do not modify shared array
[Bug #15821]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -1696,8 +1696,12 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) rb_obj_freeze(opt->script_name); if (IF_UTF8_PATH(uenc != lenc, 1)) { long i; - VALUE load_path = GET_VM()->load_path; + rb_vm_t *vm = GET_VM(); + VALUE load_path = vm->load_path; const ID id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK; + int modifiable = FALSE; + + rb_get_expanded_load_path(); for (i = 0; i < RARRAY_LEN(load_path); ++i) { VALUE path = RARRAY_AREF(load_path, i); int mark = rb_attr_get(path, id_initial_load_path_mark) == path; @@ -1709,8 +1713,15 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) path = rb_enc_associate(rb_str_dup(path), lenc); #endif if (mark) rb_ivar_set(path, id_initial_load_path_mark, path); + if (!modifiable) { + rb_ary_modify(load_path); + modifiable = TRUE; + } RARRAY_ASET(load_path, i, path); } + if (modifiable) { + rb_ary_replace(vm->load_path_snapshot, load_path); + } } Init_ext(); /* load statically linked extensions before rubygems */ if (opt->features & FEATURE_BIT(gems)) { |