From f07ba44c696f29cb73ba26a4595c44a63d6e18a5 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Sun, 24 Nov 2013 20:38:47 +0900 Subject: add enable_debug method to MRuby::Build and build debug version in travis-ci --- tasks/mruby_build.rake | 5 +++++ travis_config.rb | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index ff6110884..acaabfa81 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -87,6 +87,11 @@ module MRuby MRuby.targets[@name].instance_eval(&block) end + def enable_debug + compilers.each { |c| c.defines += %w(MRB_DEBUG) } + @mrbc.compile_options += ' -g' + end + def toolchain(name) tc = Toolchain.toolchains[name.to_s] fail "Unknown #{name} toolchain" unless tc diff --git a/travis_config.rb b/travis_config.rb index 89aef9f55..360cf3337 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -1,7 +1,16 @@ +MRuby::Build.new('debug') do |conf| + toolchain :gcc + enable_debug + + # include all core GEMs + conf.gembox 'full-core' + conf.cc.defines = %w(MRB_GC_FIXED_ARENA) +end + MRuby::Build.new do |conf| toolchain :gcc # include all core GEMs conf.gembox 'full-core' - conf.cc.defines = %w(MRB_DEBUG MRB_GC_FIXED_ARENA) + conf.cc.defines = %w(MRB_GC_FIXED_ARENA) end -- cgit v1.2.3 From 23a412830d98bf2c90ccb7c1e090cd76d80ebefd Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Sun, 24 Nov 2013 20:39:17 +0900 Subject: fix realloc error --- src/dump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dump.c b/src/dump.c index 97c07afcd..6f6063500 100644 --- a/src/dump.c +++ b/src/dump.c @@ -492,6 +492,7 @@ get_filename_table_size(mrb_state *mrb, mrb_irep *irep, mrb_sym **fp, size_t *lp } for (i=0; irlen; i++) { size += get_filename_table_size(mrb, irep->reps[i], fp, lp); + filenames = *fp; } } return size; -- cgit v1.2.3