diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-01 14:22:53 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-01 14:22:53 +0300 |
commit | 5343b3ef5757f45d84be5f74a059228981742d81 (patch) | |
tree | 6eb0f44aed46a3807197cd3460b58deb0490bd28 /scripts | |
parent | e7988103ba8e5a4438e6bc26f5cef3bad3035571 (diff) | |
parent | 67de82cf5fa5a6408621cbf955c730e2825d9c39 (diff) |
Merge branch 'gitaly-commit-languages' into 'master'
Add option to use Gitaly CommitLanguages RPC
See merge request !13084
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/gitaly-test-build | 10 | ||||
-rwxr-xr-x | scripts/gitaly-test-spawn | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build new file mode 100755 index 00000000000..44d314009e2 --- /dev/null +++ b/scripts/gitaly-test-build @@ -0,0 +1,10 @@ +#!/usr/bin/env ruby + +# This script assumes tmp/tests/gitaly already contains the correct +# Gitaly version. We just have to compile it and run its 'bundle +# install'. We have this separate script for that because weird things +# were happening in CI when we have a 'bundle exec' process that later +# called 'bundle install' using a different Gemfile, as happens with +# gitlab-ce and gitaly. + +abort 'gitaly build failed' unless system('make', chdir: 'tmp/tests/gitaly') diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn new file mode 100755 index 00000000000..dd603eec7f6 --- /dev/null +++ b/scripts/gitaly-test-spawn @@ -0,0 +1,7 @@ +#!/usr/bin/env ruby + +gitaly_dir = 'tmp/tests/gitaly' +args = %W[#{gitaly_dir}/gitaly #{gitaly_dir}/config.toml] + +# Print the PID of the spawned process +puts spawn(*args, [:out, :err] => 'log/gitaly-test.log') |