LU-4656 tests: Add MOUNT_FLAGS variable and rename MOUNTOPT

[fs/lustre-release.git] / lustre / tests / sanity-gss.sh

diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh
index 541eeac..ee07c8f 100755 (executable)
--- a/lustre/tests/sanity-gss.sh
+++ b/lustre/tests/sanity-gss.sh
@@ -507,7 +507,7 @@ test_102() {
 run_test 102 "survive from insanely fast flavor switch"
 
 test_150() {
-    local save_opts
+    local mount_opts
     local count
     local clients=$CLIENTS
 
@@ -524,18 +524,14 @@ test_150() {
     zconf_umount_clients $clients $MOUNT || return 1
 
     # mount client with conflict flavor - should fail
-    save_opts=$MOUNTOPT
-       MOUNTOPT="$MOUNTOPT,mgssec=gssnull"
-       zconf_mount_clients $clients $MOUNT &&
-               error "mount with conflict flavor should have failed"
-    MOUNTOPT=$save_opts
+    mount_opts="${MOUNT_OPTS:+$MOUNT_OPTS,}mgssec=gssnull"
+    zconf_mount_clients $clients $MOUNT $mount_opts &&
+        error "mount with conflict flavor should have failed"
 
     # mount client with same flavor - should succeed
-    save_opts=$MOUNTOPT
-    MOUNTOPT="$MOUNTOPT,mgssec=null"
-    zconf_mount_clients $clients $MOUNT || \
+    mount_opts="${MOUNT_OPTS:+$MOUNT_OPTS,}mgssec=null"
+    zconf_mount_clients $clients $MOUNT $mount_opts ||
         error "mount with same flavor should have succeeded"
-    MOUNTOPT=$save_opts
     zconf_umount_clients $clients $MOUNT || return 2
 
     # mount client with default flavor - should succeed