summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-12-21 17:20:43 -0600
committerClement Ho <ClemMakesApps@gmail.com>2017-12-21 17:20:43 -0600
commitaa1874fbf8795677e53797205cb65b6f4fb83d4c (patch)
tree85a5cfb6bdac803258df8e2df09a50169468996a /scripts
parent3895d54c6bfbd37ac65624496c0fd7b4973944e7 (diff)
parent82e31ee46784cc4a0b987511ce7506dd01a3f004 (diff)
downloadgitlab-ce-move-gl-dropdown.tar.gz
Merge branch 'master' into move-gl-dropdownmove-gl-dropdown
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gitaly-test-spawn3
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