b=14620

i=Adilger

t-f have_modules fn; force log fnto unload modules if it has loaded them

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 2bb61fe..6aaef7e 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -129,6 +129,10 @@ init_test_env() {
 
 }
 
+have_modules () {
+    lsmod | grep -q lnet
+}
+
 load_module() {
     EXT=".ko"
     module=$1
@@ -153,11 +157,8 @@ load_modules() {
         # use modprobe
     return 0
     fi
-    if [ "$HAVE_MODULES" = true ]; then
-    # we already loaded
-        return 0
-    fi
-    HAVE_MODULES=true
+    # we already loaded ?
+    have_modules && return 0
 
     echo Loading modules from $LUSTRE
     load_module ../lnet/libcfs/libcfs
@@ -257,7 +258,6 @@ unload_modules() {
         wait_for_lnet || return 3
     fi
     fi
-    HAVE_MODULES=false
 
     LEAK_LUSTRE=$(dmesg | tail -n 30 | grep "obd mem.*leaked" || true)
     LEAK_PORTALS=$(dmesg | tail -n 20 | grep "Portals memory leaked" || true)
@@ -1216,7 +1216,9 @@ equals_msg() {
 
 log() {
     echo "$*"
-    lsmod | grep lnet > /dev/null || load_modules
+
+    local HAVE_MODULES=""
+    lsmod | grep lnet > /dev/null || { load_modules && HAVE_MODULES="yes"; }
 
     local MSG="$*"
     # Get rif of '
@@ -1229,6 +1231,8 @@ log() {
     for NODE in $NODES; do
         do_node $NODE $LCTL mark "$MSG" 2> /dev/null || true
     done
+
+    [ -z "$HAVE_MODULES" ] || unload_modules
 }
 
 trace() {