X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bfaee40696c3c15556ef089e69da47bb832b08db..608f3e19607e00b76ef9fb8cedef8124a31ceff7:/build/run-tests.sh diff --git a/build/run-tests.sh b/build/run-tests.sh index 9adcf5dc5a..d6415e239d 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -105,7 +105,6 @@ services/keep-balance services/login-sync services/crunch-dispatch-local services/crunch-dispatch-slurm -services/workbench2 services/workbench2_units services/workbench2_integration services/ws @@ -718,7 +717,7 @@ do_test() { stop_services check_arvados_config "$1" ;; - gofmt | doc | lib/cli | lib/cloud/azure | lib/cloud/ec2 | lib/cloud/cloudtest | lib/cmd | lib/dispatchcloud/sshexecutor | lib/dispatchcloud/worker | services/workbench2_units | services/workbench2_integration | services/workbench2) + gofmt | doc | lib/cli | lib/cloud/azure | lib/cloud/ec2 | lib/cloud/cloudtest | lib/cmd | lib/dispatchcloud/sshexecutor | lib/dispatchcloud/worker | services/workbench2_units | services/workbench2_integration) check_arvados_config "$1" # don't care whether services are running ;; @@ -1062,11 +1061,6 @@ test_services/workbench2_integration() { cd "$WORKSPACE/services/workbench2" && make integration-tests ARVADOS_DIRECTORY="${WORKSPACE}" WORKSPACE="$(pwd)" ${testargs[services/workbench2]} } -test_services/workbench2() { - test_services/workbench2_units - test_services/workbench2_integration -} - test_apps/workbench_units() { local TASK="test:units" cd "$WORKSPACE/apps/workbench" \ @@ -1167,7 +1161,8 @@ test_all() { do_test apps/workbench_integration do_test apps/workbench_benchmark do_test apps/workbench_profile - do_test services/workbench2 + do_test services/workbench2_units + do_test services/workbench2_integration } test_go() {