Branch b1_8_gate

b=16699
i=adilger
i=grev

skip test_43 for non 1.8 MDS

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 08aa931..1522c25 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1643,6 +1643,13 @@ run_test 42 "invalid config param should not prevent client from mounting"
 
 test_43() { #bug 15993
         setup
+        VERSION_1_8=$(do_facet mds $LCTL get_param version | grep ^lustre.*1\.[78])
+        if [ -z "$VERSION_1_8" ]; then
+                skip "skipping test for non 1.8 MDS"
+                cleanup
+                return 0
+        fi
+
         check_mount || return 2
         testfile=$DIR/$tfile
         lma="this-should-be-removed-after-remount-and-accessed"