summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-bin-mruby
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2019-11-29 19:02:04 +0900
committerKOBAYASHI Shuji <[email protected]>2019-11-29 19:02:04 +0900
commitdf437eebcc50b7c7bd3d68c6d954ba44681b79a3 (patch)
treef3905d96dd7e9ea77d589a2ebf41f84942066380 /mrbgems/mruby-bin-mruby
parent75e96c6927afd14ee7cee2f7c936b8736cb35339 (diff)
downloadmruby-df437eebcc50b7c7bd3d68c6d954ba44681b79a3.tar.gz
mruby-df437eebcc50b7c7bd3d68c6d954ba44681b79a3.zip
Fix `mruby --verbose` (regression by #4827)
#### Before this patch: ``` $ bin/mruby --verbose -e 'p 1' bin/mruby: Cannot open program file: --verbose ``` #### After this patch: ``` $ bin/mruby --verbose -e 'p 1' 00001 NODE_SCOPE: (snip) irep 0x7fe97041df30 nregs=4 nlocals=1 pools=0 syms=1 reps=0 iseq=11 file: -e 1 000 OP_LOADSELF R1 (snip) 1 ```
Diffstat (limited to 'mrbgems/mruby-bin-mruby')
-rw-r--r--mrbgems/mruby-bin-mruby/bintest/mruby.rb4
-rw-r--r--mrbgems/mruby-bin-mruby/tools/mruby/mruby.c1
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);