LU-14789 tests: make sanity 133f and 133g working

[fs/lustre-release.git] / lustre / tests / parallel-scale-cifs.sh

diff --git a/lustre/tests/parallel-scale-cifs.sh b/lustre/tests/parallel-scale-cifs.sh
index 9e99d80..cb1c40e 100644 (file)
--- a/lustre/tests/parallel-scale-cifs.sh
+++ b/lustre/tests/parallel-scale-cifs.sh
@@ -13,11 +13,11 @@
 
 #set -vx
 
-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_logging
+
 . $LUSTRE/tests/setup-cifs.sh
 
 check_and_setup_lustre
@@ -35,8 +35,7 @@ SMBCLIENTS=${SMBCLIENTS:-$CLIENTS}
 SMBCLIENTS=$(exclude_items_from_list $SMBCLIENTS $LUSTRE_CLIENT_SMBSRV)
 
 [ -z "$SMBCLIENTS" ] &&
-       skip_env "need at least two nodes: samba server and samba client" &&
-       exit 0
+       skip_env "need at least two nodes: samba server and samba client"
 
 # set CONFIGURE_SMB=false to skip smb config
 CONFIGURE_SMB=${CONFIGURE_SMB:-true}
@@ -173,6 +172,8 @@ test_fsx() {
        local space=$(df -P $SMBCLIMNTPT | tail -n 1 | awk '{ print $4 }')
        [ $space -lt $((size * nclients)) ] && size=$((space * 3 / 4 / nclients))
 
+       check_set_fallocate
+
        local cmd="$FSX -c 50 -p 500 -S $seed -P $TMP -l $size -N $numop "
 
        echo "Using: $cmd"