From a526319c2a822c1a2b06b09d734fa3da6f84ec31 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Mon, 2 Feb 2015 10:27:01 -0500
Subject: [PATCH] 3021: Fix up some error checking.

---
 jenkins/run-tests.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 98734ca..07f5cdd 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -533,17 +533,17 @@ do_install apps/workbench workbench
 
 start_api() {
     echo 'Starting API server...'
-    cd "$WORKSPACE" && \
-        eval $(python sdk/python/tests/run_test_server.py start --auth admin) && \
-        export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" && \
-        export ARVADOS_TEST_API_INSTALLED="$$" && \
-        (env | egrep ^ARVADOS)
+    cd "$WORKSPACE" \
+        && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \
+        && export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
+        && export ARVADOS_TEST_API_INSTALLED="$$" \
+        && (env | egrep ^ARVADOS)
 }
 
 stop_api() {
     unset ARVADOS_TEST_API_HOST
-    cd "$WORKSPACE" && \
-        python sdk/python/tests/run_test_server.py stop
+    cd "$WORKSPACE" \
+        && python sdk/python/tests/run_test_server.py stop
 }
 
 test_doclinkchecker() {
@@ -561,8 +561,8 @@ do_test doc doclinkchecker
 stop_api
 
 test_apiserver() {
-    cd "$WORKSPACE/services/api"
-    RAILS_ENV=test bundle exec rake test ${testargs[services/api]}
+    cd "$WORKSPACE/services/api" \
+        && RAILS_ENV=test bundle exec rake test ${testargs[services/api]}
 }
 do_test services/api apiserver
 
-- 
2.30.2