From: grev <grev>
Date: Fri, 16 Oct 2009 13:53:11 +0000 (+0000)
Subject: b=20719
X-Git-Tag: v1_8_2_01~1^2~13
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2718caf5281a42d0bed3d9c5c44fe1b968165321;p=fs%2Flustre-release.git

b=20719
i=Alexey.Lyashkov
i=Robert.Read
module_loaded fn
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 6c559a1..a51bece 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -164,12 +164,19 @@ case `uname -r` in
     *) EXT=".ko"; USE_QUOTA=yes;;
 esac
 
+
+module_loaded () {
+   /sbin/lsmod | grep -q $1
+}
+
 load_module() {
     module=$1
     shift
     BASE=`basename $module $EXT`
-    lsmod | grep -q ${BASE} || \
-      if [ -f ${LUSTRE}/${module}${EXT} ]; then
+
+    module_loaded ${BASE} && return
+
+    if [ -f ${LUSTRE}/${module}${EXT} ]; then
         insmod ${LUSTRE}/${module}${EXT} $@
     else
         # must be testing a "make install" or "rpm" installation
@@ -830,7 +837,7 @@ cleanup_check() {
     [ "`lctl dl 2> /dev/null | wc -l`" -gt 0 ] && lctl dl && \
         echo "$0: lustre didn't clean up..." 1>&2 && return 202 || true
 
-    if [ "`/sbin/lsmod 2>&1 | egrep 'lnet|libcfs'`" ]; then
+    if module_loaded lnet || module_loaded libcfs; then
         echo "$0: modules still loaded..." 1>&2
         /sbin/lsmod 1>&2
         return 203
@@ -2082,7 +2089,7 @@ equals_msg() {
 
 log() {
     echo "$*"
-    lsmod | grep lnet > /dev/null || load_modules
+    module_loaded lnet || load_modules
 
     local MSG="$*"
     # Get rid of '