X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e26dc8ebc182bec997624213c771f06e9b0179e8..09afabfb3de546d55c3a33ae0b68291edf414fcb:/build/run-tests.sh diff --git a/build/run-tests.sh b/build/run-tests.sh index ad7960275e..636c0306ca 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -616,6 +616,12 @@ then gem install --user-install bundler || fatal 'Could not install bundler' fi +# Jenkins config requires that glob tmp/*.log match something. Ensure +# that happens even if we don't end up running services that set up +# logging. +mkdir -p "${WORKSPACE}/tmp/" || fatal "could not mkdir ${WORKSPACE}/tmp" +touch "${WORKSPACE}/tmp/controller.log" || fatal "could not touch ${WORKSPACE}/tmp/controller.log" + retry() { remain="${repeat}" while : @@ -652,8 +658,9 @@ do_test() { ;; esac if [[ -z "${skip[$suite]}" && -z "${skip[$1]}" && \ - (-z "${only}" || "${only}" == "${suite}" || \ - "${only}" == "${1}") ]]; then + (-z "${only}" || "${only}" == "${suite}" || \ + "${only}" == "${1}") || + "${only}" == "${2}" ]]; then retry do_test_once ${@} else title "Skipping ${1} tests"