X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun-llog.sh;h=58bc5a4c68c0713451881a7b1735b128e00e44a4;hb=8b0b0892da03dc5de5cd4025b9d31c9217b1e6f1;hp=1b808e995ce6c3d93aa28c0d6487f248fade8bee;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 1b808e9..58bc5a4 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,32 +1,45 @@
 #!/bin/bash
-PATH=`dirname $0`:`dirname $0`/../utils:$PATH
+
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
+load_llog_test() {
+    grep -q llog_test /proc/modules && return
+    # Module should have been placed with other lustre modules...
+    modprobe llog_test 2>&1 | grep -v "llog_test not found"
+    grep -q llog_test /proc/modules && return
+    # But maybe we're running from a developer tree...
+    insmod $LUSTRE/obdclass/llog_test.ko
+    grep -q llog_test /proc/modules && return
+    echo "Unable to load llog_test module!"
+    false
+    return
+}
+
+PATH=$(dirname $0):$LUSTRE/utils:$PATH
 TMP=${TMP:-/tmp}
 
-MDS=`ls $LPROC/mds | grep -v num_refs | head -n 1`
-[ -z "$MDS" ] && echo "no MDS available, skipping llog test" && exit 0
+set -x
+MGS=$($LCTL dl | awk '/mgs/ { print $4 }')
+[ -z "$MGS" ] && echo "$0: SKIP: no MGS available, skipping llog test" && exit 0
 
-case `uname -r` in
-2.4.*) insmod ../obdclass/llog_test.o || exit 1 ;;
-2.6.*) insmod ../obdclass/llog_test.ko || exit 1 ;;
-*) echo "unknown kernel version `uname -r`" && exit 99 ;;
-esac
-lctl modules > $TMP/ogdb-`hostname`
+load_llog_test || exit 0
+$LCTL modules > $TMP/ogdb-$(hostname)
 echo "NOW reload debugging syms.."
 
 RC=0
-lctl <<EOT || RC=2
-attach llog_test llt_name llt_uuid
-setup $MDS
-EOT
-
 # Using ignore_errors will allow lctl to cleanup even if the test fails.
-lctl <<EOC
-device llt_name
-ignore_errors
-cleanup
-detach
-EOC
-rmmod llog_test || RC2=3
+eval "$LCTL <<-EOF || RC=2
+	attach llog_test llt_name llt_uuid
+	setup $MGS
+	device llt_name
+	ignore_errors
+	cleanup
+	detach
+EOF"
+rmmod -vw llog_test || RC2=3
 [ $RC -eq 0 -a "$RC2" ] && RC=$RC2
 
 exit $RC