From 02d27b88fe5afeb52e69b387929ef8d59663c09c Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Sat, 14 Feb 2015 14:21:14 -0500 Subject: [PATCH] When run-tests.sh is invoked to only run the api server tests, do not spin up an api server for all the tests that will not be run. No issue # --- jenkins/run-tests.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh index 03928ce..a706068 100755 --- a/jenkins/run-tests.sh +++ b/jenkins/run-tests.sh @@ -546,6 +546,13 @@ stop_api() { && python sdk/python/tests/run_test_server.py stop } +clean_up() { + report_outcomes + clear_temp + + exit ${#failures} +} + test_doclinkchecker() { ( set -e @@ -566,6 +573,14 @@ test_apiserver() { } do_test services/api apiserver +# Shortcut for when we're only running apiserver tests. This saves a bit of time, +# because we don't need to start up the api server for subsequent tests. +if [ ! -z "$only" ] && [ "$only" == "services/api" ]; then + rotate_logfile "$WORKSPACE/services/api/log/" "test.log" + + clean_up +fi + start_api test_ruby_sdk() { @@ -612,9 +627,6 @@ do_test apps/workbench_profile workbench_profile rotate_logfile "$WORKSPACE/apps/workbench/log/" "test.log" stop_api -rotate_logfile "$WORKSPACE/services/api/log/" "test.log" -report_outcomes -clear_temp - -exit ${#failures} +rotate_logfile "$WORKSPACE/services/api/log/" "test.log" +clean_up -- 2.30.2