From 1ee0d3d0933c2e10f07a46269f0badcadc7c91d4 Mon Sep 17 00:00:00 2001
From: nathan <nathan>
Date: Tue, 20 Jun 2006 21:42:51 +0000
Subject: [PATCH] Branch b1_5 more info on err

---
 lustre/tests/test-framework.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 4982979..4e17acd 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -113,12 +113,13 @@ load_modules() {
 }
 
 unload_modules() {
-    lsmod | grep lnet > /dev/null && $LCTL dk $TMP/debug
+    lsmod | grep lnet > /dev/null && $LCTL dl && $LCTL dk $TMP/debug
     local MODULES=`$LCTL modules | awk '{ print $2 }'`
     rmmod $MODULES >/dev/null 2>&1 
      # do it again, in case we tried to unload ksocklnd too early
     lsmod | grep lnet > /dev/null && rmmod $MODULES >/dev/null 2>&1 
     lsmod | grep lnet && echo "modules still loaded" && return 1
+    HAVE_MODULES=false
 
     LEAK_LUSTRE=`dmesg | tail -n 30 | grep "obd mem.*leaked"`
     LEAK_PORTALS=`dmesg | tail -n 20 | grep "Portals memory leaked"`
@@ -129,7 +130,7 @@ unload_modules() {
         echo "Memory leaks detected"
         return 254
     fi
-    HAVE_MODULES=false
+    return 0
 }
 
 # Facet functions
-- 
1.8.3.1