[ARVADOS-DEV] updated: 80f4c0641ca89efa0813feaa3429de9b471dd816

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-tests.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 8 deletions(-)

       via  80f4c0641ca89efa0813feaa3429de9b471dd816 (commit)
      from  c05dc4cdc80d754a284e93478e643fd38dec123f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 80f4c0641ca89efa0813feaa3429de9b471dd816
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Dec 30 10:04:46 2014 -0500

    Add some more sanity checks in run-tests.sh, and refactor that part of the script
    a little.
    
    No issue #

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 23e89c0..93d1c2b 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -124,6 +124,49 @@ report_outcomes() {
         done
     fi
 }
+
+sanity_checks() {
+  # Make sure WORKSPACE is set
+  if ! [[ -n "$WORKSPACE" ]]; then
+    echo >&2 "$helpmessage"
+    echo >&2
+    echo >&2 "Error: WORKSPACE environment variable not set"
+    echo >&2
+    exit 1
+  fi
+
+  # Make sure virtualenv is installed
+  `virtualenv --help >/dev/null 2>&1`
+
+  if [[ "$?" != "0" ]]; then
+    echo >&2
+    echo >&2 "Error: virtualenv could not be found"
+    echo >&2
+    exit 1
+  fi
+
+  # Make sure go is installed
+  `go env >/dev/null 2>&1`
+
+  if [[ "$?" != "0" ]]; then
+    echo >&2
+    echo >&2 "Error: go could not be found"
+    echo >&2
+    exit 1
+  fi
+
+  # Make sure gcc is installed
+  `gcc --help >/dev/null 2>&1`
+
+  if [[ "$?" != "0" ]]; then
+    echo >&2
+    echo >&2 "Error: gcc could not be found"
+    echo >&2
+    exit 1
+  fi
+
+}
+
 declare -a failures
 declare -A skip
 declare -A testargs
@@ -167,14 +210,7 @@ do
     esac
 done
 
-# Sanity check
-if ! [[ -n "$WORKSPACE" ]]; then
-  echo >&2 "$helpmessage"
-  echo >&2
-  echo >&2 "Error: WORKSPACE environment variable not set"
-  echo >&2
-  exit 1
-fi
+sanity_checks
 
 echo "WORKSPACE=$WORKSPACE"
 

-----------------------------------------------------------------------


hooks/post-receive
--