land b1_5 onto HEAD

[fs/lustre-release.git] / lustre / tests / llmountcleanup.sh

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index ea054ee..076faa7 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,60 +1,10 @@
-#!/bin/sh
-
+#!/bin/bash
 export PATH=`dirname $0`/../utils:$PATH
-
-LCONF=${LCONF:-lconf}
 NAME=${NAME:-local}
-TMP=${TMP:-/tmp}
-
-config=$NAME.xml
-mkconfig=$NAME.sh
-
-. krb5_env.sh
-
-if [ "$PORTALS" ]; then
-  portals_opt="--portals=$PORTALS"
-fi
-
-if [ "$LUSTRE" ]; then
-  lustre_opt="--lustre=$LUSTRE"
-fi
-
-if [ "$LDAPURL" ]; then
-    conf_opt="--ldapurl $LDAPURL --config $NAME"
-else
-    if [ ! -f $config ]; then
-       sh $mkconfig $config || exit 1
-    fi
-    conf_opt="$config"
-fi    
-
-[ "$NODE" ] && node_opt="--node $NODE"
-
-sync; sleep 2; sync
-
-[ "$MOUNT2" ] && umount $MOUNT2
-
-${LCONF} $NOMOD $portals_opt $lustre_opt $node_opt --cleanup $@ \
-    --dump $TMP/debug $conf_opt
-rc=$?
-echo "lconf DONE"
-stop_lsvcgssd
-stop_lgssd
 
-BUSY=`dmesg | grep -i destruct`
-if [ "$BUSY" ]; then
-       echo "$BUSY" 1>&2
-       mv $TMP/debug $TMP/debug-busy.`date +%s`
-       exit 255
-fi
-LEAK_LUSTRE=`dmesg | tail -n 30 | grep "obd mem.*leaked"`
-LEAK_PORTALS=`dmesg | tail -n 20 | grep "Portals memory leaked"`
-if [ "$LEAK_LUSTRE" -o "$LEAK_PORTALS" ]; then
-       echo "$LEAK_LUSTRE" 1>&2
-       echo "$LEAK_PORTALS" 1>&2
-       mv $TMP/debug $TMP/debug-leak.`date +%s`
-       exit 254
-fi
-lsmod | grep portals && echo "modules still loaded" && exit 1
+LUSTRE=${LUSTRE:-`dirname $0`/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
-exit $rc
+cleanupall -f