X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-dom.sh;h=4fa9ce4ee6c5b0176e34e812b55a7a82008f85fe;hb=4a4d888a07da2eaec5723473cdc5440768b4a9e3;hp=ffff7db2764e742b2c3507946f6c6c2bd77c48fe;hpb=06740440363424bff6cfdb467fcc5544e42cabc1;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh
index ffff7db..4fa9ce4 100644
--- a/lustre/tests/sanity-dom.sh
+++ b/lustre/tests/sanity-dom.sh
@@ -172,15 +172,23 @@ test_fsx() {
 	local file1=$DIR1/$tfile
 	local file2=$DIR2/$tfile
 
+	check_set_fallocate
+
 	touch $file1
-	fsx -c 50 -p 100 -N 1000 -l $((DOM_SIZE*2)) -S 0 -d -d $file1 $file2
+	$FSX -c 50 -p 100 -N 1000 -l $((DOM_SIZE*2)) -S 0 -d -d $file1 $file2
 }
 run_test fsx "Dual-mount fsx with DoM files"
 
 test_sanity()
 {
-	SANITY_ONLY=${SANITY_ONLY:-"36 39 40 41 42d 42e 43 46 56r 101e 119a \
-				    131 150 155a 155b 155c 155d 207 241 251"}
+	local testlist="36 39 40 41 42d 42e 43 46 56r 101e 119a \
+			131 150a 155a 155b 155c 155d 207 241 251"
+
+	# Fallocate tests
+	(( $MDS1_VERSION >= $(version_code 2.14.52) )) &&
+		testlist+=" 150b 150bb 150c 150d 150f 150g"
+
+	SANITY_ONLY=${SANITY_ONLY:-$testlist}
 	SANITY_REPEAT=${SANITY_REPEAT:-1}
 	# XXX: to fix 45. Add 42a, c when LU-9693 fixed.
 	# Add 42b when LU-6493 fixed
@@ -193,8 +201,14 @@ run_test sanity "Run sanity with Data-on-MDT files"
 
 test_sanityn()
 {
-	SANITYN_ONLY=${SANITYN_ONLY:-"1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 \
-				      23 27 39 51a 51c 51d 107"}
+	local testlist="1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 \
+			23 27 39 51a 51c 51d"
+
+	if [[ $MDS1_VERSION -ge $(version_code 2.13.55) ]]; then
+		testlist+=" 107"
+	fi
+
+	SANITYN_ONLY=${SANITYN_ONLY:-$testlist}
 	SANITYN_REPEAT=${SANITYN_REPEAT:-1}
 	# XXX: to fix 60
 	ONLY=$SANITYN_ONLY ONLY_REPEAT=$SANITYN_REPEAT OSC="mdc" DOM="yes" \
@@ -206,4 +220,6 @@ run_test sanityn "Run sanityn with Data-on-MDT files"
 
 complete $SECONDS
 check_and_cleanup_lustre
-exit_status "${TMP}/sanity.log ${TMP}/sanityn.log"
+declare -a logs=($ONLY)
+logs=("${logs[@]/#/$TMP/}")
+exit_status "$(echo ${logs[@]/%/.log})"