Index: example/megatest.config ================================================================== --- example/megatest.config +++ example/megatest.config @@ -9,11 +9,11 @@ # This is your link path, best to set it and then not change it linktree #{getenv PWD}/linktree # Job tools control how your jobs are launched [jobtools] -launcher nbfind +launcher nbfake # As you run more tests you may need to add additional disks # the names are arbitrary but must be unique [disks] disk0 #{getenv PWD}/runs Index: example/tests/diskspace/diskspace.sh ================================================================== --- example/tests/diskspace/diskspace.sh +++ example/tests/diskspace/diskspace.sh @@ -1,18 +1,24 @@ #!/bin/bash -e -diskareas=`mount | egrep 'ext|mfs|nfs'|grep -v proc | awk '{print $3}'` +filter=`refdb lookup $MT_RUN_AREA_HOME/$CFG_TYPE machines $TARGETHOST filter` + +echo "Using filter: $filter" + +diskareas=`mount | egrep 'ext|mfs|nfs'| egrep -v "$filter" | awk '{print $3}'` for dirname in $diskareas;do + echo "dirname: $dirname" + # measure the free space - freespace=`df -k $dirname | grep $dirname | awk '{print $4}'` + freespace=`df -P -k $dirname | grep $dirname | awk '{print $4}'` # get the minfree allowed from the refdb minfree=`refdb lookup $MT_RUN_AREA_HOME/$CFG_TYPE machines $TARGETHOST minfree` - if [[ $freespace -lt $minfree ]];then + if [[ "$freespace" -lt "$minfree" ]];then echo "ERROR: available space $freespace is less than minimum allowed of $minfree on $dirname" else echo "INFO: space available of $freespace k on $dirname meets required minimum of $minfree." fi done