X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fposix.sh;h=58ef6a3b797292404e9689e0b073e55bdbe90fb3;hp=19293f52d69ef8c29c649ecea23723479d5848bb;hb=da1d93513fdff0a70257b13aa5649e478d4f70b6;hpb=b7b080bcb0e2cac15174de44b1b822fc11feec02

diff --git a/lustre/tests/posix.sh b/lustre/tests/posix.sh
index 19293f5..58ef6a3 100755
--- a/lustre/tests/posix.sh
+++ b/lustre/tests/posix.sh
@@ -1,13 +1,16 @@
 #!/bin/bash
-#set -vx
 set -e
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+ONLY=${ONLY:-"$*"}
+
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+ALWAYS_EXCEPT="$POSIX_EXCEPT"
+build_test_filter
+
 POSIX_DIR=${POSIX_DIR:-"$LUSTRE/tests/posix"}
 POSIX_SRC=${POSIX_SRC:-"/usr/src/posix"}
 BASELINE_FS=${BASELINE_FS:-"ext4"}
@@ -15,17 +18,16 @@ 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-}
 fi
 
 check_and_setup_lustre
-build_test_filter
 
 cleanup_loop_dev() {
     local mnt=$1
@@ -128,7 +130,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