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

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 1c023ca..58bc5a4 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,45 +1,45 @@
 #!/bin/bash
 
+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
+    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 ../obdclass/llog_test.ko
-    grep -q llog_test /proc/modules && return
-    # This is for 2.4 kernels (deprecated!)
-    insmod ../obdclass/llog_test.o
+    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`:`dirname $0`/../utils:$PATH
+PATH=$(dirname $0):$LUSTRE/utils:$PATH
 TMP=${TMP:-/tmp}
 
-MDS=`ls /proc/fs/lustre/mdt | 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
 
 load_llog_test || exit 0
-lctl modules > $TMP/ogdb-`hostname`
+$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