3894: Fix -n that should have been -z. Flatten condition.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 742baebad07df6f3bd3825da5f6b211f998fd3c4..2b528307585606ec3c7463bc7e05006bfb2d6eeb 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -156,11 +156,9 @@ done
 echo "WORKSPACE=$WORKSPACE"
 [[ -n "$WORKSPACE" ]] || fatal "WORKSPACE not set"
 
-if [[ -n "$CONFIGSRC" ]]; then
-    if [[ -d "$HOME/arvados-api-server" ]]; then
-        # Jenkins expects us to use this by default.
-        CONFIGSRC="$HOME/arvados-api-server"
-    fi
+if [[ -z "$CONFIGSRC" ]] && [[ -d "$HOME/arvados-api-server" ]]; then
+    # Jenkins expects us to use this by default.
+    CONFIGSRC="$HOME/arvados-api-server"
 fi
 
 # Set up temporary install dirs (unless existing dirs were supplied)