diff options
| author | Zachary Scott <[email protected]> | 2015-09-02 23:11:18 -0400 |
|---|---|---|
| committer | Zachary Scott <[email protected]> | 2015-09-03 01:02:53 -0400 |
| commit | bacb8268682e8d931a00e7894ed7904bc789d8c4 (patch) | |
| tree | 9b34d3025d195741cc5c028fad9dd7962beec04a /travis_config.rb | |
| parent | cc0b28373a304541308b6386f4be15aedf30ce43 (diff) | |
| download | mruby-bacb8268682e8d931a00e7894ed7904bc789d8c4.tar.gz mruby-bacb8268682e8d931a00e7894ed7904bc789d8c4.zip | |
Add build_mrbtest after config block is evaluated
This allows us to add `enable_test` anywhere in a build target,
without having to worry about the order in which they are included.
Previously, there was a bug that occured when adding 'mruby-test' gem
to dependencies before additional gems.
Instead of adding the 'mruby-test' gem dependency manually to a test build,
we now only need to call `enable_test` in the target. This also allows us to
call `test_enabled?` downstream when running mruby tests ourselves.
/cc #2924
Diffstat (limited to 'travis_config.rb')
| -rw-r--r-- | travis_config.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/travis_config.rb b/travis_config.rb index 458473f96..4ee6d752b 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -22,6 +22,7 @@ MRuby::Build.new do |conf| c.defines += %w(MRB_GC_FIXED_ARENA) end conf.enable_bintest + conf.enable_test end MRuby::Build.new('cxx_abi') do |conf| @@ -33,18 +34,9 @@ MRuby::Build.new('cxx_abi') do |conf| c.defines += %w(MRB_GC_FIXED_ARENA) end conf.enable_bintest + conf.enable_test enable_cxx_abi build_mrbc_exec end - -MRuby::Build.new('test') do |conf| - toolchain :gcc - - enable_debug - conf.enable_bintest - - conf.gembox 'full-core' - conf.gem :core => "mruby-test" -end |
