diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-05-07 09:06:01 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-05-07 09:46:24 +0300 |
| commit | 6f481026058993305a256529a405e697a9efec2c (patch) | |
| tree | 1288742913d1dc5af94f95592a263c580f1bc183 /_support | |
| parent | e775ff27ce0e6e71cd48bd3babf7e694bf4cd2a5 (diff) | |
test-boot: Switch to use Gitaly from build directory
We're about to drop installing Gitaly binaries into the source
directory, where current users should all use binaries from the build
directory instead. Our test-boot script is still using the old directory
though, so let's switch it over.
Diffstat (limited to '_support')
| -rwxr-xr-x | _support/test-boot | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/_support/test-boot b/_support/test-boot index ca19b118f..3c8638637 100755 --- a/_support/test-boot +++ b/_support/test-boot @@ -7,8 +7,9 @@ ADDR = 'socket'.freeze def main(gitaly_dir) gitaly_dir = File.realpath(gitaly_dir) + bin_dir = File.join(gitaly_dir, '_build', 'bin') - version = IO.popen("#{File.join(gitaly_dir, 'gitaly')} -version").read.delete_prefix('Gitaly, version ').strip + version = IO.popen("#{File.join(bin_dir, 'gitaly')} -version").read.delete_prefix('Gitaly, version ').strip version_from_file = IO.read(File.join(gitaly_dir, 'VERSION')).strip # Use start_with? instead of == because the version output could use git describe, if it is a source install @@ -22,7 +23,7 @@ def main(gitaly_dir) File.write('config.toml', <<~CONFIG socket_path = "#{ADDR}" - bin_dir = "#{gitaly_dir}" + bin_dir = "#{bin_dir}" [[storage]] name = "default" @@ -44,7 +45,7 @@ def main(gitaly_dir) begin start = Time.now - pid = spawn(File.join(gitaly_dir, 'gitaly'), 'config.toml') + pid = spawn(File.join(bin_dir, 'gitaly'), 'config.toml') wait_connect puts puts "\n\nconnection established after #{Time.now - start} seconds\n\n" |