Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/logstash-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ bundle exec rake prepare_geoip_resources

if [[ "$INTEGRATION" != "true" ]]; then
bundle exec rspec --format=documentation spec/unit --tag ~integration --tag ~secure_integration
bundle exec rake java_test
else

if [[ "$SECURE_INTEGRATION" == "true" ]]; then
Expand Down
14 changes: 4 additions & 10 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
require 'logstash/devutils/rake'

task :install_jars do
task :vendor do
sh('./gradlew clean vendor')
end

task :prepare_geoip_resources do
sh('./gradlew geoipTestResources')
end

task :vendor => :install_jars

task :test do
require 'rspec'
require 'rspec/core/runner'
Rake::Task[:install_jars].invoke
Rake::Task[:generate_ssl].invoke
sh './gradlew test'
exit(RSpec::Core::Runner.run(Rake::FileList['spec/**/*_spec.rb']))
task :java_test do
sh('./gradlew test')
end