FreeBSD/src/test/run-cli-tests: execlude RBD tests from run

 - FreeBSD does not have RBD
 - changed layout or complex if-then-fi, te be more legible

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

diff --git a/src/test/run-cli-tests b/src/test/run-cli-tests
index 48fc90e61a281317c7079b6986977a71b8c75194..94b280aec0853e7fed5214d0e3ff316286fdfd1d 100755 (executable)
--- a/src/test/run-cli-tests
+++ b/src/test/run-cli-tests
@@ -41,7 +41,16 @@ mkdir -p "$FAKE_HOME"
 # cram doesn't like seeing the same foo.t basename twice on the same
 # run, so run it once per directory
 FAILED=0
+FAILEDTOOLS=""
 for tool in "$SRCDIR"/cli/*; do
+    if [ x`uname`x = xFreeBSDx ]; then
+       if [ x"$tool"x = x"$SRCDIR/cli/rbd"x ]; then
+           echo "Skipping test: $tool."
+           continue
+       else
+           echo "Running test: $tool."
+       fi
+    fi 
     toolname="$(basename "$tool")"
     install -d -m0755 -- "$BUILDDIR/cli/$toolname"
     if ! env -i \
@@ -52,9 +61,15 @@ for tool in "$SRCDIR"/cli/*; do
        CXX="$CXX" \
        HOME="$FAKE_HOME" \
        "$SRCDIR/run-cli-tests-maybe-unset-ccache" \
-       "$CRAM_BIN" -v "$@"  --error-dir="$BUILDDIR/cli/$toolname" -- "$tool"/*.t; then
+       "$CRAM_BIN" -v "$@"  --error-dir="$BUILDDIR/cli/$toolname" -- "$tool"/*.t
+    then
        FAILED=1
+       FAILEDTOOLS="$FAILEDTOOLS $toolname"
     fi
 done
 
+if [ $FAILED -eq 1 ]; then
+    echo "Tests that failed: $FAILEDTOOLS"
+fi
+
 exit "$FAILED"