X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Ffunctions.sh;h=dfcebba586f5f81e8d96dd8c55b42871c19881c9;hb=08cf056915cbab31a7b7a88d75cc2cba7bfe02ce;hp=23ff2a435a67215bde59166c0a1e2051421df340;hpb=8db990334e243f98d253c55a46675c2d633dc9cc;p=fs%2Flustre-release.git diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh index 23ff2a4..dfcebba 100644 --- a/lustre/tests/functions.sh +++ b/lustre/tests/functions.sh @@ -296,7 +296,7 @@ run_compilebench() { [ -e $cbench_DIR/compilebench ] || \ { skip_env "No compilebench build" && return; } - local space=$(lfs_df $DIR | awk '/^filesystem/{ print $4 }') + local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }') if [[ $space -le $((1024 * 1024 * cbench_IDIRS)) ]]; then cbench_IDIRS=$((space / 1024 / 1024)) [[ $cbench_IDIRS -eq 0 ]] && @@ -908,7 +908,7 @@ run_statahead () { local num_mntpts=$statahead_NUMMNTPTS local mntpt_root=$TMP/mntpt/lustre - local mntopts=${MNTOPTSTATAHEAD:-$MOUNTOPT} + local mntopts=$MNTOPTSTATAHEAD echo "Mounting $num_mntpts lustre clients starts on $clients" trap "cleanup_statahead $clients $mntpt_root $num_mntpts" EXIT ERR