X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fposix.sh;h=28cde8f3539219abf71eed6259743bd98b36c803;hb=6bce536725efd166d2772f13fe954f271f9c53b8;hp=4c36a9a6dab16299b498c21b75eb61c61e1d8a34;hpb=95c0d6fa814657b04375d2276e8c1a4d484d028d;p=fs%2Flustre-release.git diff --git a/lustre/tests/posix.sh b/lustre/tests/posix.sh index 4c36a9a..28cde8f 100755 --- a/lustre/tests/posix.sh +++ b/lustre/tests/posix.sh @@ -24,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-} @@ -137,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