X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun-llog.sh;h=7c34dc6b6bf27d21e62d7c77295c35324f44f7f7;hb=a4771a6935a97376cc93dfaf023b0a12e9d07511;hp=64d64038d0dfc66f800b6aefe997f99b3aa2cb83;hpb=c5050e412572b00cbe93d8517d2d1f767bebfa92;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 64d6403..7c34dc6b 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,16 +1,32 @@
 #!/bin/bash
-insmod ../obdclass/llog_test.o
-../utils/lctl modules > /r/tmp/ogdb-localhost.localdomain
+
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
+PATH=$(dirname $0):$LUSTRE/utils:$PATH
+TMP=${TMP:-/tmp}
+
+set -x
+MGS=$($LCTL dl | awk '/mgs/ { print $4 }')
+[ -z "$MGS" ] && echo "$0: SKIP: no MGS available, skipping llog test" && exit 0
+
+load_module obdclass/llog_test || exit 0
+$LCTL modules > $TMP/ogdb-$(hostname)
 echo "NOW reload debugging syms.."
 
-# Using ignore_errors will allow lctl to cleanup even if the test
-# fails.
-../utils/lctl <<EOF
-ignore_errors
-newdev
-attach llog_test llt_name llt_uuid
-setup mds1
-cleanup
-detach
-EOF
-rmmod llog_test
+RC=0
+# Using ignore_errors will allow lctl to cleanup even if the test fails.
+eval "$LCTL <<-EOF || RC=2
+	attach llog_test llt_name llt_uuid
+	setup $MGS
+	device llt_name
+	ignore_errors
+	cleanup
+	detach
+EOF"
+rmmod -v llog_test || RC2=3
+[ $RC -eq 0 -a "$RC2" ] && RC=$RC2
+
+exit $RC