Rakefile in elasticsearch-api-1.0.6 vs Rakefile in elasticsearch-api-1.0.7
- old
+ new
@@ -3,11 +3,11 @@
def __current__
Pathname( File.expand_path('..', __FILE__) )
end
def git_specs(command, options={})
- sh "git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} #{command}", options
+ sh "git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} #{command}", options
end
task(:default) { system "rake --tasks" }
task :test => 'test:unit'
@@ -42,11 +42,11 @@
desc "Run integration tests"
task :integration do
require 'elasticsearch'
- branches = `git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} branch --no-color`
+ branches = `git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} branch --no-color`
current_branch = branches.
split("\n").
select { |b| b =~ /^\*/ }.
reject { |b| b =~ /no branch|detached/ }.
@@ -96,10 +96,10 @@
STDERR.puts '-'*80, "YAML tests: Switching to #{name} from #{current_branch}", '-'*80
git_specs "checkout #{checkout_build_hash} --force --quiet"
end
# Path to the API specs
- ENV['TEST_REST_API_SPEC'] = __current__.join('../support/elasticsearch/rest-api-spec/test/').to_s
+ ENV['TEST_REST_API_SPEC'] = __current__.join('../tmp/elasticsearch/rest-api-spec/test/').to_s
# Run the task
args = [t.ruby_opts_string, t.run_code, t.file_list_string, t.option_list].join(' ')
ruby args do |ok, status|