diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-03-06 15:58:39 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-03-06 15:58:39 +0100 |
| commit | 86c085f522d2a34ff62e1b2c33595555a7ab8b74 (patch) | |
| tree | 19f967767f162d2074a015c97ff7edda040210a7 | |
| parent | 76684188ad7e9bf28b7392a9ae0262748dba0184 (diff) | |
| download | gitlab-ce-gitaly-ruby-isolation-failure-6.tar.gz | |
Set BUNDLE_PATH in scripts/gitaly-test-spawngitaly-ruby-isolation-failure-6
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rwxr-xr-x | scripts/gitaly-test-build | 6 | ||||
| -rwxr-xr-x | scripts/gitaly-test-spawn | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build index 251c3debeb2..48bf2f96ac7 100755 --- a/scripts/gitaly-test-build +++ b/scripts/gitaly-test-build @@ -10,10 +10,12 @@ require 'fileutils' # gitlab-ce and gitaly. tmp_tests_gitaly_dir = File.expand_path('../tmp/tests/gitaly', __dir__) +gitaly_ruby_gemfile_path = File.join(tmp_tests_gitaly_dir, 'ruby', 'Gemfile'), +gitaly_ruby_bundle_path = File.join(tmp_tests_gitaly_dir, 'ruby', 'vendor'), env = { - 'BUNDLE_GEMFILE' => File.join(tmp_tests_gitaly_dir, 'ruby', 'Gemfile'), - 'BUNDLE_FLAGS' => "--jobs=4 --path=vendor --retry=3" + 'BUNDLE_GEMFILE' => gitaly_ruby_gemfile_path, + 'BUNDLE_FLAGS' => "--jobs=4 --path=#{gitaly_ruby_bundle_path} --retry=3" } abort 'gitaly build failed' unless system(env, 'make', chdir: tmp_tests_gitaly_dir) diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index a51128ff344..c84de641b91 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -4,8 +4,7 @@ require 'rubygems' require 'bundler' gitaly_dir = 'tmp/tests/gitaly' -gitaly_ruby_gem_path = File.expand_path(File.join('..', gitaly_dir, 'ruby/vendor/ruby/2.3.0'), __dir__) -gitaly_ruby_bundle_path = File.expand_path(File.join('..', gitaly_dir, 'ruby/vendor'), __dir__) +gitaly_ruby_bundle_path = File.expand_path(File.join('..', gitaly_dir, 'ruby', 'vendor', 'ruby', '2.3.0'), __dir__) puts "Gem.path: #{Gem.path.inspect}" puts "ENV['BUNDLE_GEMFILE']: #{ENV['BUNDLE_GEMFILE'].inspect}" @@ -38,7 +37,8 @@ end env = { 'HOME' => File.expand_path('tmp/tests'), - 'GEM_PATH' => gitaly_ruby_gem_path, + # 'GEM_PATH' => gitaly_ruby_gem_path, + 'GEM_PATH' => Gem.path.join(':'), 'BUNDLE_PATH' => gitaly_ruby_bundle_path } |