diff options
| -rw-r--r-- | src/dump.c | 4 | ||||
| -rw-r--r-- | tasks/mruby_build.rake | 6 | ||||
| -rw-r--r-- | travis_config.rb | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/dump.c b/src/dump.c index 6f6063500..f1fc56d8e 100644 --- a/src/dump.c +++ b/src/dump.c @@ -547,8 +547,6 @@ write_debug_record_1(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const ret = cur - bin; uint32_to_bin(ret, bin); - mrb_assert((cur - bin) == (int)get_debug_record_size(mrb, irep)); - return ret; } @@ -565,6 +563,8 @@ write_debug_record(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const* bin += len; size += len; } + + mrb_assert(size == (int)get_debug_record_size(mrb, irep)); return size; } diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index acaabfa81..8f5881f3b 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -103,7 +103,7 @@ module MRuby end def mrbcfile - MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/mrbc") + MRuby.targets[@name].exefile("#{MRuby.targets[@name].build_dir}/bin/mrbc") end def compilers @@ -204,6 +204,10 @@ module MRuby super end + def mrbcfile + MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/mrbc") + end + def run_test mrbtest = exefile("#{build_dir}/test/mrbtest") if (@test_runner.command == nil) diff --git a/travis_config.rb b/travis_config.rb index 360cf3337..4fad04797 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -4,7 +4,7 @@ MRuby::Build.new('debug') do |conf| # include all core GEMs conf.gembox 'full-core' - conf.cc.defines = %w(MRB_GC_FIXED_ARENA) + conf.cc.defines += %w(MRB_GC_FIXED_ARENA) end MRuby::Build.new do |conf| @@ -12,5 +12,5 @@ MRuby::Build.new do |conf| # include all core GEMs conf.gembox 'full-core' - conf.cc.defines = %w(MRB_GC_FIXED_ARENA) + conf.cc.defines += %w(MRB_GC_FIXED_ARENA) end |