diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2020-12-08 09:00:04 -0800 |
|---|---|---|
| committer | Jeremy Evans <code@jeremyevans.net> | 2020-12-10 10:16:40 -0800 |
| commit | dca13e2bf7b7efeb2841a039e3cfd7b5cd650a7b (patch) | |
| tree | 795125a73f5c292dbc6fba267cff997f34b02eb3 | |
| parent | 699608487d2ff09bb5c610a9d1e6e13f5bd2a25e (diff) | |
| download | ruby-dca13e2bf7b7efeb2841a039e3cfd7b5cd650a7b.tar.gz | |
Make ruby -We the same as ruby -W -e
This changes the behavior, which I'm not sure is acceptable.
However, it's odd to allow an option to be combined, but change
the behavior of the option when combined.
| -rw-r--r-- | ruby.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1140,7 +1140,7 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) if (*++s) { v = scan_oct(s, 1, &numlen); if (numlen == 0) - v = 1; + v = 2; s += numlen; } if (!opt->warning) { diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index be08ec6acc..7b1df5bc88 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -72,8 +72,9 @@ class TestRubyOptions < Test::Unit::TestCase ENV['RUBYOPT'] = nil assert_in_out_err(%w(-W0 -e) + ['p $-W'], "", %w(0), []) assert_in_out_err(%w(-W1 -e) + ['p $-W'], "", %w(1), []) - assert_in_out_err(%w(-Wx -e) + ['p $-W'], "", %w(1), []) + assert_in_out_err(%w(-Wx -e) + ['p $-W'], "", %w(2), []) assert_in_out_err(%w(-W -e) + ['p $-W'], "", %w(2), []) + assert_in_out_err(%w(-We) + ['p $-W'], "", %w(2), []) assert_in_out_err(%w(-w -W0 -e) + ['p $-W'], "", %w(0), []) assert_in_out_err(%w(-W:deprecated -e) + ['p Warning[:deprecated]'], "", %w(true), []) assert_in_out_err(%w(-W:no-deprecated -e) + ['p Warning[:deprecated]'], "", %w(false), []) @@ -82,6 +83,7 @@ class TestRubyOptions < Test::Unit::TestCase assert_in_out_err(%w(-W:qux), "", [], /unknown warning category: `qux'/) assert_in_out_err(%w(-w -e) + ['p Warning[:deprecated]'], "", %w(true), []) 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), []) ensure ENV['RUBYOPT'] = save_rubyopt |