diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-01 17:00:07 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-03-06 14:30:21 +0100 |
| commit | 76684188ad7e9bf28b7392a9ae0262748dba0184 (patch) | |
| tree | 7b376070c3eeec0dedf50a4e85e9f945339476f5 | |
| parent | e9dfc41d4d758e931b614c9fffc17036e36a92e9 (diff) | |
| download | gitlab-ce-gitaly-ruby-isolation-failure-5.tar.gz | |
Set a correct GEM_PATH in scripts/gitaly-test-spawngitaly-ruby-isolation-failure-5
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rwxr-xr-x | scripts/gitaly-test-spawn | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index f57c68fef48..a51128ff344 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -4,6 +4,8 @@ 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__) puts "Gem.path: #{Gem.path.inspect}" puts "ENV['BUNDLE_GEMFILE']: #{ENV['BUNDLE_GEMFILE'].inspect}" @@ -35,8 +37,14 @@ Dir.chdir(File.join(gitaly_dir, 'ruby')) do end env = { - 'HOME' => File.expand_path('tmp/tests') + 'HOME' => File.expand_path('tmp/tests'), + 'GEM_PATH' => gitaly_ruby_gem_path, + 'BUNDLE_PATH' => gitaly_ruby_bundle_path } + +puts "env:" +p env + args = %W[#{gitaly_dir}/gitaly #{gitaly_dir}/config.toml] # Print the PID of the spawned process |