From: Jian Yu <jian.yu@intel.com>
Date: Wed, 19 Nov 2014 21:10:10 +0000 (-0800)
Subject: LU-5932 tests: load sunrpc module before insmod ptlrpc_gss
X-Git-Tag: 2.6.92~70
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=92479eca2ed5e1871b2660af280917e4d61bdba8;p=fs%2Flustre-release.git

LU-5932 tests: load sunrpc module before insmod ptlrpc_gss

Lustre ptlrpc_gss module depends on Linux kernel sunrpc module.
This patch fixes load_module() in test-framework.sh to load the
sunrpc module before loading ptlrpc_gss module by using insmod.

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: Idf22fa9023a2fada9038e16fbc3e8a61530266bc
Reviewed-on: http://review.whamcloud.com/12790
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 43d0b93..bfdc9c2 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -416,22 +416,24 @@ load_module() {
 
     [ $# -gt 0 ] && echo "${module} options: '$*'"
 
-    # Note that insmod will ignore anything in modprobe.conf, which is why we're
-    # passing options on the command-line.
-    if [ "$BASE" == "lnet_selftest" ] && \
-            [ -f ${LUSTRE}/../lnet/selftest/${module}${EXT} ]; then
-        insmod ${LUSTRE}/../lnet/selftest/${module}${EXT}
-    elif [ -f ${LUSTRE}/${module}${EXT} ]; then
-        insmod ${LUSTRE}/${module}${EXT} "$@"
-    else
-        # must be testing a "make install" or "rpm" installation
-        # note failed to load ptlrpc_gss is considered not fatal
-        if [ "$BASE" == "ptlrpc_gss" ]; then
-            modprobe $BASE "$@" 2>/dev/null || echo "gss/krb5 is not supported"
-        else
-            modprobe $BASE "$@"
-        fi
-    fi
+	# Note that insmod will ignore anything in modprobe.conf, which is why
+	# we're passing options on the command-line.
+	if [[ "$BASE" == "lnet_selftest" ]] &&
+		[[ -f ${LUSTRE}/../lnet/selftest/${module}${EXT} ]]; then
+		insmod ${LUSTRE}/../lnet/selftest/${module}${EXT}
+	elif [[ -f ${LUSTRE}/${module}${EXT} ]]; then
+		[[ "$BASE" != "ptlrpc_gss" ]] || modprobe sunrpc
+		insmod ${LUSTRE}/${module}${EXT} "$@"
+	else
+		# must be testing a "make install" or "rpm" installation
+		# note failed to load ptlrpc_gss is considered not fatal
+		if [[ "$BASE" == "ptlrpc_gss" ]]; then
+			modprobe $BASE "$@" 2>/dev/null ||
+				echo "gss/krb5 is not supported"
+		else
+			modprobe $BASE "$@"
+		fi
+	fi
 }
 
 llite_lloop_enabled() {