Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-14475 log: Rewrite some log messages
[fs/lustre-release.git]
/
lustre
/
tests
/
posix.sh
diff --git
a/lustre/tests/posix.sh
b/lustre/tests/posix.sh
index
19293f5
..
58ef6a3
100755
(executable)
--- a/
lustre/tests/posix.sh
+++ b/
lustre/tests/posix.sh
@@
-1,13
+1,16
@@
#!/bin/bash
#!/bin/bash
-#set -vx
set -e
set -e
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+ONLY=${ONLY:-"$*"}
+
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
. $LUSTRE/tests/test-framework.sh
init_test_env $@
. $LUSTRE/tests/test-framework.sh
init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
init_logging
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"}
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
# 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 &&
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
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
cleanup_loop_dev() {
local mnt=$1
@@
-128,7
+130,7
@@
test_1() {
fi
log "Run POSIX test against lustre filesystem"
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
error_noexit "Run POSIX testsuite on $MOUNT failed"
[[ -d "$MOUNT/TESTROOT" ]] && rm -fr $MOUNT/TESTROOT