mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 06:37:19 -04:00
make sure the bundler task is just used once while bootstraping tests
Fixes #2237
This commit is contained in:
parent
93aadb4d4c
commit
d63e0ec9eb
3 changed files with 8 additions and 4 deletions
|
@ -1,3 +1,5 @@
|
|||
|
||||
|
||||
task "bootstrap" => [ "vendor:all", "compile:all" ]
|
||||
|
||||
task "bootstrap:test" => [ "vendor:test", "compile:all" ]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
namespace "test" do
|
||||
task "default" => [ "bootstrap", "test:prep" ] do
|
||||
task "default" => [ "bootstrap:test", "test:prep" ] do
|
||||
Gem.clear_paths
|
||||
require "logstash/environment"
|
||||
LogStash::Environment.set_gem_paths!
|
||||
|
@ -17,6 +17,7 @@ namespace "test" do
|
|||
end
|
||||
|
||||
task "prep" do
|
||||
Rake::Task["vendor:gems"].invoke(false)
|
||||
Rake::Task["plugin:install-test"].invoke
|
||||
end
|
||||
|
||||
|
|
|
@ -90,6 +90,7 @@ namespace "vendor" do
|
|||
end # untar
|
||||
end # jruby
|
||||
task "all" => "jruby"
|
||||
task "test" => "jruby"
|
||||
|
||||
task "geoip" do |task, args|
|
||||
vendor_name = "geoip"
|
||||
|
@ -137,6 +138,7 @@ namespace "vendor" do
|
|||
end # untar
|
||||
end # task kibana
|
||||
task "all" => "kibana"
|
||||
task "test" => "kibana"
|
||||
|
||||
task "kafka" do |task, args|
|
||||
name = task.name.split(":")[1]
|
||||
|
@ -205,12 +207,11 @@ namespace "vendor" do
|
|||
task "gems" => ["vendor:gems"]
|
||||
end
|
||||
|
||||
task "gems" do
|
||||
task "gems", [:bundle] do |task, args|
|
||||
require "logstash/environment"
|
||||
|
||||
Rake::Task["dependency:rbx-stdlib"] if LogStash::Environment.ruby_engine == "rbx"
|
||||
Rake::Task["dependency:stud"].invoke
|
||||
Rake::Task["vendor:bundle"].invoke("tools/Gemfile")
|
||||
Rake::Task["vendor:bundle"].invoke("tools/Gemfile") if args.to_hash.empty? || args[:bundle]
|
||||
|
||||
end # task gems
|
||||
task "all" => "gems"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue