LU-2471 tests: Fix facet_type() to recognise names like mds1_2

[fs/lustre-release.git] / lustre / tests / liblustre.sh

diff --git a/lustre/tests/liblustre.sh b/lustre/tests/liblustre.sh
index daf7f5a..0309b33 100644 (file)
--- a/lustre/tests/liblustre.sh
+++ b/lustre/tests/liblustre.sh
@@ -21,13 +21,15 @@ export LIBLUSTRE_TIMEOUT=`lctl get_param -n timeout`
 
 test_1() {
     if ! check_versions; then
-       skip "liblustre version mismatch: cli $CLIVER, mds $MDSVER, ost $OSTVER"
+       skip "liblustre version mismatch: cli $(lustre_version_code client), \
+              mds $(lustre_version_code $SINGLEMDS), ost $(lustre_version_code ost1)"
     elif ! [ "$NETTYPE" = "tcp" -o "$NETTYPE" = "ptl" ]; then
        skip "NETTYPE=$NETTYPE unsupported for liblustre"
     elif [ ! -x $LIBLUSTRETESTS/sanity ]; then
        skip "$LIBLUSTRETESTS/sanity: not found"
     else
        mkdir -p $MOUNT2
+       echo $LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET
        $LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET
        if [ "$LIBLUSTRE_EXCEPT" ]; then
            LIBLUSTRE_OPT="$LIBLUSTRE_OPT \
@@ -38,3 +40,7 @@ test_1() {
     fi
 }
 run_test 1 "liblustre sanity"
+
+complete $SECONDS
+check_and_cleanup_lustre
+exit_status