LU-1538 tests: standardize test script init - lnet

[fs/lustre-release.git] / lustre / tests / lnet-selftest.sh

diff --git a/lustre/tests/lnet-selftest.sh b/lustre/tests/lnet-selftest.sh
index 10631ca..ed8104d 100755 (executable)
--- a/lustre/tests/lnet-selftest.sh
+++ b/lustre/tests/lnet-selftest.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
-# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
-# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
 ALWAYS_EXCEPT="$LNET_SELFTEST_EXCEPT"
@@ -22,6 +19,8 @@ if [ -r /etc/os-release ]; then
        fi
 fi
 
+build_test_filter
+
 [ x$LST = x ] && skip_env "lst not found LST=$LST"
 
 # FIXME: what is the reasonable value here?
@@ -90,8 +89,6 @@ if is_mounted $MOUNT2; then
        interim_umount1=true
 fi
 
-build_test_filter
-
 lst_prepare () {
     # Workaround for bug 15619
     lst_cleanup_all