Branch b1_6

Skip test 32b for remote OST.

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 2d2b1b4..6cbb5fd 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -133,9 +133,9 @@ test_2e() {
 run_test 2e "check chmod on root is propagated to others"
 
 test_3() {
-       ( cd $DIR1 ; ln -s this/is/good lnk )
-       [ "this/is/good" = "`perl -e 'print readlink("'$DIR2/lnk'");'`" ] || \
-               error
+       ( cd $DIR1 ; ln -s this/is/good $tfile )
+       [ "this/is/good" = "`perl -e 'print readlink("'$DIR2/$tfile'");'`" ] ||\
+               error "link $DIR2/$tfile not as expected"
 }
 run_test 3 "symlink on one mtpt, readlink on another ==========="
 
@@ -639,6 +639,9 @@ run_test 32a "lockless truncate"
 test_32b() { # bug 11270
         local node
         local p="$TMP/sanityN-$TESTNAME.parameters"
+
+        remote_ost_nodsh && skip "remote OST" && return 0
+
         save_lustre_params $HOSTNAME "llite.*.contention_seconds" > $p
         for node in $(osts_nodes); do
                 save_lustre_params $node "ldlm.namespaces.filter-*.max_nolock_bytes" >> $p