X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fposix.sh;h=0b8ba613a5d37242f7c8e5368f741ec8ec556383;hb=8e563553c0a26f0d8e8caf2a44b44a7f552531e9;hp=2f4e9f44d13206936939059b4cd5aa0f7680082a;hpb=e2226ae35978f223bf851dabf15eb6b606da8020;p=fs%2Flustre-release.git

diff --git a/lustre/tests/posix.sh b/lustre/tests/posix.sh
index 2f4e9f4..0b8ba61 100755
--- a/lustre/tests/posix.sh
+++ b/lustre/tests/posix.sh
@@ -1,22 +1,16 @@
 #!/bin/bash
-#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=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_test_env "$@"
 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"}
@@ -24,7 +18,7 @@ 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"
@@ -34,7 +28,6 @@ if [[ $(facet_fstype $SINGLEMDS) = zfs ]]; then
 fi
 
 check_and_setup_lustre
-build_test_filter
 
 cleanup_loop_dev() {
     local mnt=$1