projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14988: Fixes merge conflict
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 68fc15183e5a55cb488cab48c7f9a83367f6c075..2807d3c3a39e6824cdce5f1a649efa60c9f867b0 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-1051,11
+1051,7
@@
test_gofmt() {
test_services/api() {
rm -f "$WORKSPACE/services/api/git-commit.version"
cd "$WORKSPACE/services/api" \
test_services/api() {
rm -f "$WORKSPACE/services/api/git-commit.version"
cd "$WORKSPACE/services/api" \
-<<<<<<< HEAD
- && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec bin/rails test TESTOPTS='-v -d' ${testargs[services/api]}
-=======
&& env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS='-v -d' ${testargs[services/api]}
&& env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS='-v -d' ${testargs[services/api]}
->>>>>>> master
}
test_sdk/ruby() {
}
test_sdk/ruby() {