Kouhei Sutou
null+****@clear*****
Sun Mar 27 22:16:14 JST 2016
Kouhei Sutou 2016-03-27 22:16:14 +0900 (Sun, 27 Mar 2016) New Revision: a7f43b6b8d2f90b30246d9af261a622cc211ddfd https://github.com/ranguba/groonga-client-rails/commit/a7f43b6b8d2f90b30246d9af261a622cc211ddfd Message: travis: simplify Modified files: .travis.yml test/run-test.rb Modified: .travis.yml (+0 -8) =================================================================== --- .travis.yml 2016-03-27 22:11:47 +0900 (9c33516) +++ .travis.yml 2016-03-27 22:16:14 +0900 (1db860d) @@ -19,11 +19,3 @@ install: (cd ${test_app} && \ BUNDLE_GEMFILE=${test_app}/Gemfile bundle install --jobs=3 --retry=3) done -script: - - test/unit/run-test.rb - - | - for test_app in ${PWD}/test/apps/* - do - (cd ${test_app} && \ - BUNDLE_GEMFILE=${test_app}/Gemfile bundle exec rake) - done Modified: test/run-test.rb (+7 -12) =================================================================== --- test/run-test.rb 2016-03-27 22:11:47 +0900 (531500b) +++ test/run-test.rb 2016-03-27 22:16:14 +0900 (554ff19) @@ -33,24 +33,19 @@ def unbundler ENV["RUBYOPT"] = nil end -if bundlered? - require "pp" - pp ENV - unbundler - pp ENV - command_line = ["bundle", "exec"] -else - command_line = [RbConfig.ruby] -end +unbundler if bundlered? Dir.glob("#{__dir__}/apps/*") do |test_application| env = {} - command_line.concat(["bin/rake", "test", "TESTOPTS=#{ARGV.join(' ')}"]) + command_line = [ + RbConfig.ruby, + "bin/rake", + "test", + "TESTOPTS=#{ARGV.join(' ')}", + ] options = { :chdir => test_application, } - system(env, "bundle", "exec", "env", options) - system(env, "bundle", "exec", "pwd", options) unless system(env, *command_line, options) exit(false) end -------------- next part -------------- HTML����������������������������...Download