summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-01-09 16:52:51 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-01-13 18:12:49 +0900
commit6f6dfdcc685077f0f85dcdd63843ecfc0f6fbfb6 (patch)
tree9dbc77bf2524600a691d6d30b6f98097d89fd478
parent85b5d4c8bf4cdcba4f1af65f2bc0c8ac716cb795 (diff)
Make warning values consistent [Bug #17523]
They should be affected, as well as `$VERBOSE`, by `-w`/`-W` options, not only in the main script but in scripts loaded by `-r` option too.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4042
-rw-r--r--ruby.c4
-rw-r--r--test/ruby/test_rubyoptions.rb9
2 files changed, 11 insertions, 2 deletions
diff --git a/ruby.c b/ruby.c
index 949b4b43f38..5bac96b5e19 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1510,6 +1510,8 @@ ruby_opt_init(ruby_cmdline_options_t *opt)
}
}
+ rb_warning_category_update(opt->warn.mask, opt->warn.set);
+
Init_ext(); /* load statically linked extensions before rubygems */
rb_call_builtin_inits();
ruby_init_prelude();
@@ -1946,7 +1948,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
ruby_set_script_name(progname);
rb_parser_set_options(parser, opt->do_print, opt->do_loop,
opt->do_line, opt->do_split);
- rb_warning_category_update(opt->warn.mask, opt->warn.set);
ast = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
}
else {
@@ -2186,7 +2187,6 @@ load_file_internal(VALUE argp_v)
}
rb_parser_set_options(parser, opt->do_print, opt->do_loop,
opt->do_line, opt->do_split);
- rb_warning_category_update(opt->warn.mask, opt->warn.set);
if (NIL_P(f)) {
f = rb_str_new(0, 0);
rb_enc_associate(f, enc);
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 214b89c9b82..b7831948f06 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -85,6 +85,15 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(%w(-W -e) + ['p Warning[:deprecated]'], "", %w(true), [])
assert_in_out_err(%w(-We) + ['p Warning[:deprecated]'], "", %w(true), [])
assert_in_out_err(%w(-e) + ['p Warning[:deprecated]'], "", %w(false), [])
+ code = 'puts "#{$VERBOSE}:#{Warning[:deprecated]}:#{Warning[:experimental]}"'
+ Tempfile.create(["test_ruby_test_rubyoption", ".rb"]) do |t|
+ t.puts code
+ t.close
+ assert_in_out_err(["-r#{t.path}", '-e', code], "", %w(false:false:true false:false:true), [])
+ assert_in_out_err(["-r#{t.path}", '-w', '-e', code], "", %w(true:true:true true:true:true), [])
+ assert_in_out_err(["-r#{t.path}", '-W:deprecated', '-e', code], "", %w(false:true:true false:true:true), [])
+ assert_in_out_err(["-r#{t.path}", '-W:no-experimental', '-e', code], "", %w(false:false:false false:false:false), [])
+ end
ensure
ENV['RUBYOPT'] = save_rubyopt
end