LU-1193 tests: test script fixes for incompatibility

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

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 4e4a855..076faa7 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,14 +1,10 @@
-#!/bin/sh
-
-LCONF=${LCONF:-../utils/lconf}
+#!/bin/bash
+export PATH=`dirname $0`/../utils:$PATH
 NAME=${NAME:-local}
 
-config=$NAME.xml
-mkconfig=./$NAME.sh
-
-if [ ! -f $config -o $mkconfig -nt $config ]; then
-   $mkconfig $config || exit 1
-fi
-
-${LCONF} --cleanup --dump /tmp/debug $config
+LUSTRE=${LUSTRE:-`dirname $0`/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
+cleanupall -f