18874: Fix run-tests.sh test targets.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 9adcf5dc5acbd856d5178ac46402728af645efe0..d6415e239d9f021581011596c9a74942d0b7a2f3 100755 (executable)
--- 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() {