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 0ad8c35..0309b33 100644 (file)
--- a/lustre/tests/liblustre.sh
+++ b/lustre/tests/liblustre.sh
@@ -21,7 +21,8 @@ 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
@@ -40,6 +41,6 @@ test_1() {
 }
 run_test 1 "liblustre sanity"
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 check_and_cleanup_lustre
 exit_status