diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-11-29 21:53:12 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-29 21:53:12 +0900 |
| commit | 5eb08a0d1a936688ee8b928e693f0ed085831315 (patch) | |
| tree | f3905d96dd7e9ea77d589a2ebf41f84942066380 /mrbgems/mruby-bin-mruby | |
| parent | 75e96c6927afd14ee7cee2f7c936b8736cb35339 (diff) | |
| parent | df437eebcc50b7c7bd3d68c6d954ba44681b79a3 (diff) | |
| download | mruby-5eb08a0d1a936688ee8b928e693f0ed085831315.tar.gz mruby-5eb08a0d1a936688ee8b928e693f0ed085831315.zip | |
Merge pull request #4846 from shuujii/fix-mruby---verbose-regression-by--4827
Fix `mruby --verbose` (regression by #4827)
Diffstat (limited to 'mrbgems/mruby-bin-mruby')
| -rw-r--r-- | mrbgems/mruby-bin-mruby/bintest/mruby.rb | 4 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb index b234b6c6f..f63ac9a30 100644 --- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb +++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb @@ -128,6 +128,10 @@ assert('mruby -r option (file not found)') do assert_mruby("", /\A.*: Cannot open library file: .*\n\z/, false, %w[-r _no_exists_]) end +assert('mruby --verbose option') do + assert_mruby(/\A[^\n]*NODE.*\n:end\n\z/m, "", true, %w[--verbose -e p(:end)]) +end + assert('mruby --') do assert_mruby(%{["-x", "1"]\n}, "", true, %w[-e p(ARGV) -- -x 1]) end diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c index aa1ea9b80..facfe335e 100644 --- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c +++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c @@ -189,7 +189,6 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) } else if (strcmp(opt, "verbose") == 0) { args->verbose = TRUE; - break; } else if (strcmp(opt, "copyright") == 0) { mrb_show_copyright(mrb); |
