diff options
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/mrbgem_spec.rake | 2 | ||||
| -rw-r--r-- | tasks/mrbgems_test.rake | 4 | ||||
| -rw-r--r-- | tasks/mruby_build_commands.rake | 4 | ||||
| -rw-r--r-- | tasks/ruby_ext.rake | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake index 4b2ce6499..564836630 100644 --- a/tasks/mrbgem_spec.rake +++ b/tasks/mrbgem_spec.rake @@ -124,7 +124,7 @@ module MRuby f.puts %Q[ mrb_load_irep(mrb, gem_mrblib_irep_#{funcname});] f.puts %Q[ if (mrb->exc) {] f.puts %Q[ mrb_p(mrb, mrb_obj_value(mrb->exc));] - f.puts %Q[ exit(0);] + f.puts %Q[ exit(EXIT_FAILURE);] f.puts %Q[ }] end f.puts %Q[ mrb_gc_arena_restore(mrb, ai);] diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake index 7b78c9878..48acdcf53 100644 --- a/tasks/mrbgems_test.rake +++ b/tasks/mrbgems_test.rake @@ -34,7 +34,7 @@ MRuby.each_target do f.puts %Q[ mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_preload);] f.puts %Q[ if (mrb2->exc) {] f.puts %Q[ mrb_p(mrb2, mrb_obj_value(mrb2->exc));] - f.puts %Q[ exit(0);] + f.puts %Q[ exit(EXIT_FAILURE);] f.puts %Q[ }] f.puts %Q[ mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern(mrb2, "GEMNAME"), mrb_str_new(mrb2, "#{g.name}", #{g.name.length}));] @@ -53,7 +53,7 @@ MRuby.each_target do f.puts %Q[ mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_#{i});] f.puts %Q[ if (mrb2->exc) {] f.puts %Q[ mrb_p(mrb2, mrb_obj_value(mrb2->exc));] - f.puts %Q[ exit(0);] + f.puts %Q[ exit(EXIT_FAILURE);] f.puts %Q[ }] f.puts %Q[ ] diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake index 0effa648b..b647ccf98 100644 --- a/tasks/mruby_build_commands.rake +++ b/tasks/mruby_build_commands.rake @@ -249,11 +249,9 @@ module MRuby def run(out, infiles, funcname) @command ||= @build.mrbcfile - commandline = "#{filename @command} #{@compile_options % {:funcname => funcname}}" - IO.popen(commandline, 'r+') do |io| + IO.popen("#{filename @command} #{@compile_options % {:funcname => funcname}}", 'r+') do |io| [infiles].flatten.each do |f| _pp "MRBC", f.relative_path, nil, :indent => 2 - log "#{commandline} ## #{f}" io.write IO.read(f) end io.close_write diff --git a/tasks/ruby_ext.rake b/tasks/ruby_ext.rake index a0fbe7b72..0a0883e02 100644 --- a/tasks/ruby_ext.rake +++ b/tasks/ruby_ext.rake @@ -45,7 +45,7 @@ end $pp_show = true if $verbose.nil? - unless Rake.verbose.nil? + if Rake.respond_to?(:verbose) && !Rake.verbose.nil? if Rake.verbose.class == TrueClass # verbose message logging $pp_show = false |