diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-02-10 09:50:32 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-02-10 09:50:32 +0900 |
| commit | d7960bf2a92bf27cfce3d8871e44eb87d7ce55b3 (patch) | |
| tree | 1781c0e7624aae34ddf3609e94dc2e48eea30d8e /travis_config.rb | |
| parent | 5519bd69bcd8b5c91b546d397371a42db796bf27 (diff) | |
| parent | 05fb139d28c2814b2b19a65d0f83c72bc1644777 (diff) | |
| download | mruby-d7960bf2a92bf27cfce3d8871e44eb87d7ce55b3.tar.gz mruby-d7960bf2a92bf27cfce3d8871e44eb87d7ce55b3.zip | |
resolve conflict in travis_config.rb
Diffstat (limited to 'travis_config.rb')
| -rw-r--r-- | travis_config.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/travis_config.rb b/travis_config.rb index 4fad04797..6f406ae37 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -12,5 +12,6 @@ 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_DEBUG MRB_GC_FIXED_ARENA) + conf.enable_bintest = true end |