LU-13960 tests: correct usage of _var variable

[fs/lustre-release.git] / lustre / tests / posix.sh

diff --git a/lustre/tests/posix.sh b/lustre/tests/posix.sh
index 19293f5..28cde8f 100755 (executable)
--- a/lustre/tests/posix.sh
+++ b/lustre/tests/posix.sh
@@ -2,6 +2,15 @@
 #set -vx
 set -e
 
+ONLY=${ONLY:-"$*"}
+
+# bug number for skipped test:
+ALWAYS_EXCEPT="$POSIX_EXCEPT"
+# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+[ "$ALWAYS_EXCEPT$EXCEPT" ] &&
+       echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT"
+
 LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
@@ -15,10 +24,10 @@ BASELINE_FS=${BASELINE_FS:-"ext4"}
 # SLES does not support read-write access to an ext4 file system by default
 [[ -e /etc/SuSE-release ]] && BASELINE_FS=ext3
 
-if [[ $(facet_fstype $SINGLEMDS) = zfs ]]; then
+if [[ "$mds1_FSTYPE" = zfs ]]; then
        BASELINE_FS=zfs
        ! which $ZFS $ZPOOL >/dev/null 2>&1 &&
-               skip_env "need $ZFS and $ZPOOL commands" && exit 0
+               skip_env "need $ZFS and $ZPOOL commands"
 
        POSIX_ZPOOL=$FSNAME-posix
        POSIX_ZFS=$POSIX_ZPOOL/${POSIX_ZPOOL##$FSNAME-}
@@ -128,7 +137,7 @@ test_1() {
        fi
 
        log "Run POSIX test against lustre filesystem"
-       run_posix $MOUNT compare || \
+       run_posix $MOUNT $MGSNID $FSNAME compare ||
                error_noexit "Run POSIX testsuite on $MOUNT failed"
 
        [[ -d "$MOUNT/TESTROOT" ]] && rm -fr $MOUNT/TESTROOT