Branch b1_5

b=9858
fix setfacl check

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 02d13a9..3d129f6 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -57,8 +57,8 @@ MOUNTOPT=""
     MOUNTOPT=$MOUNTOPT" --failnode=`h2$NETTYPE $ostfailover_HOST`"
 OST_MKFS_OPTS="--ost --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$TIMEOUT $MKFSOPT $MOUNTOPT $OSTOPT"
 
-MDS_MOUNT_OPTS="-o loop"
-OST_MOUNT_OPTS="-o loop"
+MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"-o loop"}
+OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o loop"}
 
 #client
 MOUNT=${MOUNT:-/mnt/${FSNAME}}

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index fed8e0f..a20900e 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -225,6 +225,8 @@ test_17() {
 run_test 17 "timeout bulk get, evict client (2732)"
 
 test_18a() {
+    [ -z ${ost2_svc} ] && echo Skipping, needs 2 osts && return 0
+
     do_facet client mkdir -p $MOUNT/$tdir
     f=$MOUNT/$tdir/$tfile
 

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2657540..d922836 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2983,7 +2983,7 @@ test_103 () {
 
     [ "$UID" != 0 ] && echo "skipping $TESTNAME (must run as root)" && return
     [ -z "`grep acl $LPROC/mdc/*-mdc-*/connect_flags`" ] && echo "skipping $TESTNAME (must have acl)" && return
-    $(which setfacl 2>/dev/null) || echo "skipping $TESTNAME (could not find setfacl)" && return
+    [ -z "$(which setfacl 2>/dev/null)" ] && echo "skipping $TESTNAME (could not find setfacl)" && return
 
     echo "performing cp ..."
     run_acl_subtest cp || error