X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun-llog.sh;h=714002ab6d122e284827ecde83a729b0071d8613;hb=4ce452292fbe27a1120c0c9e78288551b4f8f3f4;hp=22434b7d2d03c7ce8d82b78f1432ce6be88085e8;hpb=42f4fafd2be4c3ff9d2c5c742543dc843f757652;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 22434b7..714002a 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,24 +1,42 @@
 #!/bin/bash
-PATH=`dirname $0`:`dirname $0`/../utils:$PATH
-insmod ../obdclass/llog_test.o || exit 1
-lctl modules > /r/tmp/ogdb-`hostname`
+# SPDX-License-Identifier: GPL-2.0
+
+#
+# This file is part of Lustre, http://www.lustre.org/
+#
+# lustre/tests/run-llog.sh
+#
+# Script to run the llog_test unit tests
+#
+
+LUSTRE=${LUSTRE:-$(dirname "$0")/..}
+. "$LUSTRE/tests/test-framework.sh"
+init_test_env "$@"
+
+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 1
+$LCTL modules > "$TMP/ogdb-$(hostname)"
 echo "NOW reload debugging syms.."
 
 RC=0
-lctl <<EOT || RC=2
-newdev
-attach llog_test llt_name llt_uuid
-setup mds1
-EOT
 
 # Using ignore_errors will allow lctl to cleanup even if the test fails.
-lctl <<EOC
-cfg_device llt_name
-ignore_errors
-cleanup
-detach
-EOC
-rmmod llog_test || RC2=3
-[ $RC -eq 0 -a "$RC2" ] && RC=$RC2
+eval "$LCTL <<-EOF || RC=2
+	attach llog_test llt_name llt_uuid
+	ignore_errors
+	setup $MGS
+	--device llt_name cleanup
+	--device llt_name detach
+EOF"
+
+$LCTL dl
+
+rmmod -v llog_test || RC2=3
+[ $RC -eq 0 ] && [ "$RC2" ] && RC=$RC2
 
 exit $RC