b=16551 (att 19784)

o=Adilger
i=grev
skip replay/recovery tests if remote MDS/OSS with nodsh

b=16551 (att 19835)
i=Nathan
do skip_rem[mds|ost] check only if test suit is run; fail acc-sm if
tests suits were skipped due to nodsh

b=17326
i=Alexey.Lyashkov
remove now-useless remount/reconfig for liblustre;
always add accept=all for lnet module

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 087aef8..5c60d33 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -13,6 +13,8 @@ init_test_env $@
 ostfailover_HOST=${ostfailover_HOST:-$ost_HOST}
 #failover= must be defined in OST_MKFS_OPTIONS if ostfailover_HOST != ost_HOST
 
+remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+
 # Tests that fail on uml
 CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
 [ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 6"
@@ -122,6 +124,8 @@ kbytesfree() {
 }
 
 test_6() {
+    remote_mds_nodsh && skip "remote MDS with nodsh" && return 0
+
     f=$DIR/$tfile
     rm -f $f
     sync && sleep 2 && sync    # wait for delete thread