diff options
| author | John Cai <jcai@gitlab.com> | 2019-01-17 19:43:15 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-01-17 19:43:15 +0300 |
| commit | cb94c2b97427357f30678ce7164bb51250546d93 (patch) | |
| tree | 2db93837ba5427ebe4b8256563e1935de64d5155 /_support | |
| parent | be97ae4d2760e1065cbcd1fb66f37100b45699f0 (diff) | |
| parent | 83a0c7b826280c7d9d09d0c5826a67c82cfd3016 (diff) | |
Merge branch 'vendor-gitlab-shell-20190111' into 'master'
Vendor gitlab-shell at 6c5b195353a632095d7f6
See merge request gitlab-org/gitaly!1037
Diffstat (limited to '_support')
| -rw-r--r-- | _support/makegen.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index 575bf7104..3200f3d25 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -310,7 +310,7 @@ binaries: assemble prepare-tests: {{ .TestRepo }} {{ .GitTestRepo }} ../.ruby-bundle .PHONY: test -test: test-go rspec +test: test-go rspec rspec-gitlab-shell .PHONY: test-go test-go: prepare-tests @@ -324,6 +324,14 @@ race-go: prepare-tests rspec: assemble-go prepare-tests cd {{ .GitalyRubyDir }} && bundle exec rspec +.PHONY: rspec-gitlab-shell +rspec-gitlab-shell: {{ .GitlabShellDir }}/config.yml assemble-go prepare-tests + # rspec in {{ .GitlabShellRelDir }} + @cd {{ .GitalyRubyDir }} && bundle exec bin/ruby-cd {{ .GitlabShellDir }} rspec + +{{ .GitlabShellDir }}/config.yml: {{ .GitlabShellDir }}/config.yml.example + cp $< $@ + .PHONY: verify verify: lint check-formatting staticcheck govendor-status notice-up-to-date govendor-tagged rubocop |