Branch b1_5

b=8007
try to get some visibilty into runtest return values

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index cb79de0..2f87989 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2,8 +2,10 @@
 # vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
 
 set -e
+trap 'echo "test-framework exiting on error"' ERR
 #set -vx
 
+
 export REFORMAT=""
 export VERBOSE=false
 export GMNALNID=${GMNALNID:-/usr/sbin/gmlndnid}
@@ -117,6 +119,7 @@ load_modules() {
 }
 
 unload_modules() {
+    set -x
     lsmod | grep lnet > /dev/null && $LCTL dl && $LCTL dk $TMP/debug
     local MODULES=`$LCTL modules | awk '{ print $2 }'`
     rmmod $MODULES >/dev/null 2>&1 
@@ -134,6 +137,7 @@ unload_modules() {
         echo "Memory leaks detected"
         return 254
     fi
+    echo "modules unloaded."
     return 0
 }