From: Subrata <sub...@us...> - 2009-07-08 17:53:51
|
Update of /cvsroot/ltp/ltp/testcases/network/nfs/nfs03 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5930/ltp/testcases/network/nfs/nfs03 Modified Files: nfs03 Log Message: Fix some bashisms: this patch reflects the comments by various people to the previous versions. It uses "+=1" instead of postincrement because of dash, ['s boolean expressions, printf for the formatting. I've left the unzip pushd/popd and the signal names issue completely. Signed-off-by: Jiri Palecek <jpa...@we...>. Index: nfs03 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/nfs/nfs03/nfs03,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** nfs03 8 Dec 2006 22:34:00 -0000 1.9 --- nfs03 8 Jul 2009 17:53:48 -0000 1.10 *************** *** 92,99 **** # RETURNS: None. #============================================================================= ! function err_log { error "$1" ! let step_errors="$step_errors + 1" } --- 92,99 ---- # RETURNS: None. #============================================================================= ! err_log() { error "$1" ! : $(($step_errors+=1)) } *************** *** 108,112 **** # RETURNS: None. #============================================================================= ! function make_subdirs { i=0; --- 108,112 ---- # RETURNS: None. #============================================================================= ! make_subdirs() { i=0; *************** *** 116,120 **** mkdir -p dir$i || echo "mkdir dir$i FAILED" } ! let i="$i + 1" done; } --- 116,120 ---- mkdir -p dir$i || echo "mkdir dir$i FAILED" } ! : $(( i += 1 )) done; } *************** *** 130,134 **** # RETURNS: None. #============================================================================= ! function touch_files { echo "$0: touch files [0-$numsubdirs]/file$numsubdirs[0-$numfiles]" --- 130,134 ---- # RETURNS: None. #============================================================================= ! touch_files() { echo "$0: touch files [0-$numsubdirs]/file$numsubdirs[0-$numfiles]" *************** *** 141,148 **** while [ "$k" -lt "$numfiles" ]; do >file$j$k || err_log ">file$j$k FAILED" ! let k="$k + 1" done ! let j="$j + 1" cd .. done --- 141,148 ---- while [ "$k" -lt "$numfiles" ]; do >file$j$k || err_log ">file$j$k FAILED" ! : $(( k += 1 )) done ! : $(( j += 1 )) cd .. done *************** *** 159,163 **** # RETURNS: None. #============================================================================= ! function rm_files { echo "$0: rm files [0-$numsubdirs]/file$numsubdirs[0-$numfiles]" --- 159,163 ---- # RETURNS: None. #============================================================================= ! rm_files() { echo "$0: rm files [0-$numsubdirs]/file$numsubdirs[0-$numfiles]" *************** *** 170,177 **** while [ "$k" -lt "$numfiles" ]; do rm -f file$j$k || err_log "rm -f file$j$k FAILED" ! let k="$k + 1" done ! let j="$j + 1" cd .. done --- 170,177 ---- while [ "$k" -lt "$numfiles" ]; do rm -f file$j$k || err_log "rm -f file$j$k FAILED" ! : $(( k += 1 )) done ! : $(( j += 1 )) cd .. done *************** *** 188,192 **** # RETURNS: None. #============================================================================= ! function step1 { echo "==============================================" --- 188,192 ---- # RETURNS: None. #============================================================================= ! step1() { echo "==============================================" *************** *** 241,245 **** pid2=$! ! let i="$i + 1" done --- 241,245 ---- pid2=$! ! : $(( i += 1 )) done *************** *** 377,381 **** fs_inod $TCtmp $DIR_NUM $FILE_NUM 1 retval=$? ! echo $"fs_inod on $TCtmp finished." if [ "$retval" != 0 ]; then --- 377,381 ---- fs_inod $TCtmp $DIR_NUM $FILE_NUM 1 retval=$? ! echo "fs_inod on $TCtmp finished." if [ "$retval" != 0 ]; then |