diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-19 15:52:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-19 15:52:13 +0000 |
| commit | dc1692801d37b0859f61be2cdd3d8e5bf9f49962 (patch) | |
| tree | f91471908830bd382db252f1f0b3eb7b9c11f989 | |
| parent | 29323730190fe1847894f569f7a885ae2bc163ef (diff) | |
| parent | 873bc3a6854689549cf426f726499619205a2798 (diff) | |
| download | gitlab-ce-dc1692801d37b0859f61be2cdd3d8e5bf9f49962.tar.gz | |
Merge branch 'preserve-gem-path' into 'master'
Preserve gem path so that we use the same gems
See merge request gitlab-org/gitlab-ce!15986
| -rwxr-xr-x | scripts/gitaly-test-spawn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index 8e05eca8d7e..ecb68c6acc6 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -1,7 +1,8 @@ #!/usr/bin/env ruby gitaly_dir = 'tmp/tests/gitaly' -env = { 'HOME' => File.expand_path('tmp/tests') } +env = { 'HOME' => File.expand_path('tmp/tests'), + 'GEM_PATH' => Gem.path.join(':') } args = %W[#{gitaly_dir}/gitaly #{gitaly_dir}/config.toml] # Print the PID of the spawned process |