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-11607 tests: replace lustre_version in mds-survey/pcc/sec
[fs/lustre-release.git]
/
lustre
/
tests
/
mds-survey.sh
diff --git
a/lustre/tests/mds-survey.sh
b/lustre/tests/mds-survey.sh
index
e95452d
..
93715b2
100644
(file)
--- a/
lustre/tests/mds-survey.sh
+++ b/
lustre/tests/mds-survey.sh
@@
-1,31
+1,29
@@
#!/bin/bash
#!/bin/bash
-#set -x
set -e
set -e
-LUSTRE=${LUSTRE:-
`dirname $0`
/..}
+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
-file_count=${file_count:-150000}
-dir_count=${dir_count:-4}
-thrhi=${thrhi:-8}
-thrlo=${thrlo:-1}
+ALWAYS_EXCEPT="$MDS_SURVEY_EXCEPT "
-[ "$SLOW" = no ] && { file_count=50000; dir_count=2; thrhi=4; }
-
-# Skip these tests
-ALWAYS_EXCEPT="$MDS_SURVEY_EXCEPT"
+build_test_filter
MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)}
[ -z ${MDSSURVEY} ] && skip_env "mds-survey not found"
MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)}
[ -z ${MDSSURVEY} ] && skip_env "mds-survey not found"
-if [
$(lustre_version_code $SINGLEMDS)
-lt $(version_code 2.3.51) ]; then
- skip
_env
"Need MDS version at least 2.3.51"
+if [
"$MDS1_VERSION"
-lt $(version_code 2.3.51) ]; then
+ skip "Need MDS version at least 2.3.51"
fi
fi
-build_test_filter
+file_count=${file_count:-150000}
+dir_count=${dir_count:-4}
+thrhi=${thrhi:-8}
+thrlo=${thrlo:-1}
+
+[ "$SLOW" = no ] && { file_count=50000; dir_count=2; thrhi=4; }
+
check_and_setup_lustre
adjust_inode() {
check_and_setup_lustre
adjust_inode() {