LU-6319 tests: Clean up sanityn ALWAYS_EXCEPT list

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

diff --git a/lustre/tests/lnet-selftest.sh b/lustre/tests/lnet-selftest.sh
index 860aa92..6b0dd02 100755 (executable)
--- a/lustre/tests/lnet-selftest.sh
+++ b/lustre/tests/lnet-selftest.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/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/tests/test-framework.sh
@@ -9,7 +11,12 @@ init_logging
 #
 ALWAYS_EXCEPT="$ALWAYS_EXCEPT $LNET_SELFTEST_EXCEPT"
 
-[ x$LST = x ] &&  { skip_env "$0 : lst not found LST=$LST" && exit 0; }
+if [[ $MDSCOUNT -ge 2 ]]; then
+       #LU-4181
+       skip "Only run with single MDT for now" && exit
+fi
+
+[ x$LST = x ] && { skip_env "lst not found LST=$LST" && exit 0; }
 
 # FIXME: what is the reasonable value here?
 lst_LOOP=${lst_LOOP:-100000}
@@ -49,9 +56,10 @@ fi
 # 2) it's theoretically possible that lst tests congest comm paths so tightly
 # that mounted lustre wouldn't able to perform some of its background activities
 if is_mounted $MOUNT || is_mounted $MOUNT2; then
-    local_mode && CLIENTONLY=yes
-    stopall
-    RESTORE_MOUNT=yes
+       local_mode && CLIENTONLY=yes
+       RESTORE_MOUNT=yes
+       LOAD_MODULES_REMOTE=true
+       cleanupall
 fi
 
 build_test_filter
@@ -155,7 +163,7 @@ test_smoke () {
 }
 run_test smoke "lst regression test"
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 if [ "$RESTORE_MOUNT" = yes ]; then
     setupall
 fi