diff options
Diffstat (limited to 'sanity/system_light')
| -rwxr-xr-x | sanity/system_light/config | 2 | ||||
| -rwxr-xr-x | sanity/system_light/run.sh | 11 | ||||
| -rwxr-xr-x | sanity/system_light/scripts/fs_mark/fs_mark.sh | 4 | ||||
| -rwxr-xr-x | sanity/system_light/scripts/fsx/fsx.sh | 1 |
4 files changed, 11 insertions, 7 deletions
diff --git a/sanity/system_light/config b/sanity/system_light/config index 91422eb..0d95bcf 100755 --- a/sanity/system_light/config +++ b/sanity/system_light/config @@ -15,7 +15,7 @@ export DECISION="n" export TYPE="other" export TEST="all" -while getopts 'w:t:l:D' option +while getopts 'w:t:l:D:m' option do case $option in w) diff --git a/sanity/system_light/run.sh b/sanity/system_light/run.sh index 93852db..b8061c8 100755 --- a/sanity/system_light/run.sh +++ b/sanity/system_light/run.sh @@ -6,7 +6,10 @@ _init () set +x set -u; basedir=$(dirname $0); - SCRIPTS_PATH=$basedir/scripts; + name=$(basename $0); + abs=$(cd "$(dirname "$0")"; pwd) + SCRIPTS_PATH=$abs/scripts; + echo $abs; #SCRIPTS_PATH="/opt/qa/tools/system_light/scripts" CNT=0 . $basedir/config; @@ -35,17 +38,17 @@ function run_tests () CNT=$((CNT+1)) echo $CNT else - echo "$tool failed" + echo "$tool failed" | tee -a $TEST_FAIL echo $CNT fi return 0; else - echo "tool $tool is not there in the script directory. Exiting"; + echo "tool $tool is not there in the script directory $SCRIPTS_PATH. Exiting"; return 22; fi fi - for i in $(ls $SCRIPTS_PATH | sort -n) #grep "^[0-9]*$" | + for i in $(ls $SCRIPTS_PATH | sort -n) do if [ -f $SCRIPTS_PATH/$i/$i.sh ]; then run_tests $i; diff --git a/sanity/system_light/scripts/fs_mark/fs_mark.sh b/sanity/system_light/scripts/fs_mark/fs_mark.sh index 53404c5..12df22f 100755 --- a/sanity/system_light/scripts/fs_mark/fs_mark.sh +++ b/sanity/system_light/scripts/fs_mark/fs_mark.sh @@ -5,9 +5,9 @@ function main () echo "start: `date +%T`" - for i in `seq 1 6` + for i in `seq 0 6` do - time fs_mark -d . -D SUBDIR_COUNT -t THR_COUNT -S $i 2>>$LOG_FILE 1>>$LOG_FILE + time fs_mark -d . -D $SUBDIR_COUNT -t $THR_COUNT -S $i 2>>$LOG_FILE 1>>$LOG_FILE if [ $? -ne 0 ]; then echo "end:`date +%T`"; return 11; diff --git a/sanity/system_light/scripts/fsx/fsx.sh b/sanity/system_light/scripts/fsx/fsx.sh index 0d1a5e2..d76b5c4 100755 --- a/sanity/system_light/scripts/fsx/fsx.sh +++ b/sanity/system_light/scripts/fsx/fsx.sh @@ -8,6 +8,7 @@ function main () return 0; else return 1; + fi } main "$@";
\ No newline at end of file |