X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmountcleanup.sh;h=076faa7be7c1fe7dea8fdf9ec1e261fcbb690679;hb=e9b0c8b55c100e1d86093636309b385a913e927e;hp=cd28d211898eaef23a8794ad66707ab51b800df7;hpb=bcd7862f99b4b129c13da29205e1d6c25e2763a4;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index cd28d21..076faa7 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,40 +1,10 @@
-#!/bin/sh
-
-LCONF=${LCONF:-../utils/lconf}
+#!/bin/bash
+export PATH=`dirname $0`/../utils:$PATH
 NAME=${NAME:-local}
-TMP=${TMP:-/tmp}
-
-config=$NAME.xml
-mkconfig=$NAME.sh
-
-if [ "$PORTALS" ]; then
-  portals_opt="--portals=$PORTALS"
-fi
-
-if [ "$LUSTRE" ]; then
-  lustre_opt="--lustre=$LUSTRE"
-fi
-
-if [ ! -f $config ]; then
-   sh $mkconfig $config || exit 1
-fi
 
-sync; sleep 2; sync
-${LCONF} $portals_opt $lustre_opt --cleanup --dump $TMP/debug $config
-rc=$?
-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 -20 | grep -v "leaked: 0" | grep leaked`
-LEAK_PORTALS=`dmesg | tail -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
+LUSTRE=${LUSTRE:-`dirname $0`/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
-exit $rc
+cleanupall -f