X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9aff8a3624b463d3fd4d9302c4d41c7558df4a13..991d7d7967cef46bf5aebf95f946e3072aa1e933:/build/run-tests.sh

diff --git a/build/run-tests.sh b/build/run-tests.sh
index e254d61ee2..496ba0c6e6 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -204,8 +204,12 @@ sanity_checks() {
     echo -n 'gitolite: '
     which gitolite \
         || fatal "No gitolite. Try: apt-get install gitolite3"
-    which npm \
-          || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.xz | sudo tar -C /usr/local xJf - && sudo ln -s ../node-v6.11.2-linux-x64/bin/{node,npm} /usr/local/bin/"
+    echo -n 'npm: '
+    npm --version \
+        || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.xz | sudo tar -C /usr/local -xJf - && sudo ln -s ../node-v6.11.2-linux-x64/bin/{node,npm} /usr/local/bin/"
+    echo -n 'cadaver: '
+    cadaver --version | grep -w cadaver \
+          || fatal "No cadaver. Try: apt-get install cadaver"
 }
 
 rotate_logfile() {
@@ -476,7 +480,7 @@ pip freeze | grep -x llfuse==1.2.0 || (
     yes | pip uninstall llfuse || true
     cython --version || fatal "no cython; try sudo apt-get install cython"
     cd "$temp"
-    (cd python-llfuse || git clone https://github.com/curoverse/python-llfuse)
+    (cd python-llfuse 2>/dev/null || git clone https://github.com/curoverse/python-llfuse)
     cd python-llfuse
     git checkout 620722fd990ea642ddb8e7412676af482c090c0c
     git checkout setup.py