Yoji Shidara
null+****@clear*****
Thu Nov 28 14:15:39 JST 2013
Yoji Shidara 2013-11-28 14:15:39 +0900 (Thu, 28 Nov 2013) New Revision: 8e70c27b6cfa7a83d52ef8b85b25bed273f69fff https://github.com/droonga/fluent-plugin-droonga/commit/8e70c27b6cfa7a83d52ef8b85b25bed273f69fff Message: Simplify run-test to use master Gemfile Modified files: test/command/run-test.rb Modified: test/command/run-test.rb (+1 -17) =================================================================== --- test/command/run-test.rb 2013-11-28 14:15:20 +0900 (db7ccf5) +++ test/command/run-test.rb 2013-11-28 14:15:39 +0900 (966bdf4) @@ -24,28 +24,12 @@ def run(*command_line) exit(false) end -def need_bundle_install?(gemfile, gemfile_lock) - return true unless File.exist?(gemfile_lock) - return true if File.mtime(gemfile) > File.mtime(gemfile_lock) - false -end - base_dir = File.dirname(__FILE__) lib_dir = File.expand_path(File.join(base_dir, "..", "..", "lib")) -gemfile = File.join(base_dir, "Gemfile") -gemfile_lock = "#{gemfile}.lock" - -if need_bundle_install?(gemfile, gemfile_lock) - Dir.chdir(base_dir) do - run("bundle", "install", "--binstubs") - end -end - drntest_options = [] drntest_options.concat(["--fluentd-options", "-I#{lib_dir}"]) drntest_options.concat(["--base", base_dir]) drntest_options.concat(ARGV.dup) -run(File.join(base_dir, "bin", "drntest"), - *drntest_options) +run("bundle", "exec", "drntest", *drntest_options) -------------- next part -------------- HTML����������������������������...ダウンロード
