Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-03-06 19:44:54 +0300
committerRémy Coutable <remy@rymai.me>2018-03-06 19:44:54 +0300
commit790726bc0169e613fcbb9d5b7a440ec61a093a6e (patch)
tree63d84b5b0c152bcfcc9ee69f437a86ac669b91cd
parent86c085f522d2a34ff62e1b2c33595555a7ab8b74 (diff)
Set BUNDLE_GEMFILE in scripts/gitaly-test-spawngitaly-ruby-isolation-failure-7
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rwxr-xr-xscripts/gitaly-test-spawn2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn
index c84de641b91..394cdafcb58 100755
--- a/scripts/gitaly-test-spawn
+++ b/scripts/gitaly-test-spawn
@@ -4,6 +4,7 @@ require 'rubygems'
require 'bundler'
gitaly_dir = 'tmp/tests/gitaly'
+gitaly_ruby_gemfile_path = File.expand_path(File.join('..', gitaly_dir, 'ruby', 'Gemfile'), __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}"
@@ -39,6 +40,7 @@ env = {
'HOME' => File.expand_path('tmp/tests'),
# 'GEM_PATH' => gitaly_ruby_gem_path,
'GEM_PATH' => Gem.path.join(':'),
+ 'BUNDLE_GEMFILE' => gitaly_ruby_gemfile_path,
'BUNDLE_PATH' => gitaly_ruby_bundle_path
}