rdist01: fix mistakes
PATCH 1/1 rdist01: fix mistakes
Fix the following mistakes in the script:
1) the way it gets dirname and basename of files is broken
2) ${FILES} and ${HOSTS} get substituted when generating distfile
3) the way it calculates sum of files on RHOST is broken
4) there is no $DIRECTORIES variable
--- testcases/network/tcp_cmds/rdist/rdist01 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
testcases/network/tcp_cmds/rdist/rdist01 +11 -13
@@ -63,8 +63,8 @@ do_setup() done for i in $FILES; do - BASE=${i##*/} - DIR=${%%/*} + BASE=$(basename "$i") + DIR=$(dirname "$i") test -d "$DIR" || mkdir -p "$DIR" if [ $? -ne 0 ] ; then end_testcase "failed to create $DIR"
@@ -94,7 +94,7 @@ create_distfile() { T_FILES="FILES = ( " for i in $FILES; do - if [ "${i%%*/}" = "." ]; then + if [ $(dirname "$i") == "." ]; then T_FILES="$T_FILES $i" else T_FILES="$T_FILES $DIR"
@@ -105,7 +105,7 @@ create_distfile() T_HOST="HOSTS = (" for c_ruser in $RUSERS; do for c_rhost in $HOSTS; do - T_HOST=$T_HOST"$c_ruser@$c_rhost " + T_HOST=$T_HOST" $c_ruser@$c_rhost" done done
@@ -113,7 +113,7 @@ create_distfile() cat <<EOF > "$TCtmp/distfile" $T_HOST $T_FILES -${FILES} -> ${HOSTS} +\${FILES} -> \${HOSTS} EOF }
@@ -130,17 +130,15 @@ check_result() cd $TCtmp for c_rhost in $HOSTS; do for c_ruser in $RUSERS; do - TOTAL_SUM=`rsh -n -l $c_ruser $c_rhost \ - x=0; SUM=\$(sum -s $FILES|awk '{ print \$1 }') - for i in \$SUM; do - x=\$(( \$x + \$i )) + TOTAL_SUM=0 + for i in $(rsh -n -l $c_ruser $c_rhost sum -s $FILES | awk '{ print $1 }'); do + TOTAL_SUM=$(( $TOTAL_SUM + $i )) done - echo \$x` - if [ $TOTAL_SUM = $LSUM ]; then + if [ $TOTAL_SUM == $LSUM ]; then tst_resm TINFO "Success rdist in $c_ruser@$c_rhost " - rsh -n -l $c_ruser $c_rhost "rm -rf $FILES $DIRECTORIES" + rsh -n -l $c_ruser $c_rhost "rm -rf $FILES" else - end_testcase "Wrong sum doing rdist in $curr_ruser@$curr_rhost" + end_testcase "Wrong sum doing rdist in $curr_ruser@$curr_rhost" fi done done
Signature · 13 lines
1.8.4.2 ------------------------------------------------------------------------------ Android is increasing in popularity, but the open development platform that developers love is also attractive to malware creators. Download this white paper to learn more about secure code signing practices that can help keep Android apps secure. http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
Hi!
Quoted 5 lines
testcases/network/tcp_cmds/rdist/rdist01 +0
-1@@ -130,17 +130,15 @@ check_result() cd $TCtmp for c_rhost in $HOSTS; do for c_ruser in $RUSERS; do - TOTAL_SUM=`rsh -n -l $c_ruser $c_rhost \
testcases/network/tcp_cmds/rdist/rdist01 check_result() · line 137
Quoted 10 lines
testcases/network/tcp_cmds/rdist/rdist01 +4
-5- x=0; SUM=\$(sum -s $FILES|awk '{ print \$1 }') - for i in \$SUM; do - x=\$(( \$x + \$i )) + TOTAL_SUM=0 + for i in $(rsh -n -l $c_ruser $c_rhost sum -s $FILES | awk '{ print $1 }'); do + TOTAL_SUM=$(( $TOTAL_SUM + $i )) done - echo \$x` - if [ $TOTAL_SUM = $LSUM ]; then + if [ $TOTAL_SUM == $LSUM ]; then
Unlike C the correct comparsion operator here is the single '='. The '==' is bash extension that does not work with other shells. And in case you are comparing two numbers -eq is even better (as ' 0' -eq '0' is still true unlike ' 0' = '0').
Signature · 13 lines
Cyril Hrubis [email protected] ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
PATCH v2 1/1 rdist01: fix mistakes
Fix the following mistakes in the script:
1) the way it gets dirname and basename of files is broken
2) ${FILES} and ${HOSTS} get substituted when generating distfile
3) the way it calculates sum of files on RHOST is broken
4) there is no $DIRECTORIES variable
--- testcases/network/tcp_cmds/rdist/rdist01 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
testcases/network/tcp_cmds/rdist/rdist01 +11 -13
@@ -63,8 +63,8 @@ do_setup() done for i in $FILES; do - BASE=${i##*/} - DIR=${%%/*} + BASE=$(basename "$i") + DIR=$(dirname "$i") test -d "$DIR" || mkdir -p "$DIR" if [ $? -ne 0 ] ; then end_testcase "failed to create $DIR"
@@ -94,7 +94,7 @@ create_distfile() { T_FILES="FILES = ( " for i in $FILES; do - if [ "${i%%*/}" = "." ]; then + if [ $(dirname "$i") == "." ]; then T_FILES="$T_FILES $i" else T_FILES="$T_FILES $DIR"
@@ -105,7 +105,7 @@ create_distfile() T_HOST="HOSTS = (" for c_ruser in $RUSERS; do for c_rhost in $HOSTS; do - T_HOST=$T_HOST"$c_ruser@$c_rhost " + T_HOST=$T_HOST" $c_ruser@$c_rhost" done done
@@ -113,7 +113,7 @@ create_distfile() cat <<EOF > "$TCtmp/distfile" $T_HOST $T_FILES -${FILES} -> ${HOSTS} +\${FILES} -> \${HOSTS} EOF }
@@ -130,17 +130,15 @@ check_result() cd $TCtmp for c_rhost in $HOSTS; do for c_ruser in $RUSERS; do - TOTAL_SUM=`rsh -n -l $c_ruser $c_rhost \ - x=0; SUM=\$(sum -s $FILES|awk '{ print \$1 }') - for i in \$SUM; do - x=\$(( \$x + \$i )) + TOTAL_SUM=0 + for i in $(rsh -n -l $c_ruser $c_rhost sum -s $FILES | awk '{ print $1 }'); do + TOTAL_SUM=$(( $TOTAL_SUM + $i )) done - echo \$x` - if [ $TOTAL_SUM = $LSUM ]; then + if [ $TOTAL_SUM -eq $LSUM ]; then tst_resm TINFO "Success rdist in $c_ruser@$c_rhost " - rsh -n -l $c_ruser $c_rhost "rm -rf $FILES $DIRECTORIES" + rsh -n -l $c_ruser $c_rhost "rm -rf $FILES" else - end_testcase "Wrong sum doing rdist in $curr_ruser@$curr_rhost" + end_testcase "Wrong sum doing rdist in $curr_ruser@$curr_rhost" fi done done
Signature · 13 lines
1.8.4.2 ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
Hi!
Quoted 5 lines
Fix the following mistakes in the script:
1) the way it gets dirname and basename of files is broken
2) ${FILES} and ${HOSTS} get substituted when generating distfile
3) the way it calculates sum of files on RHOST is broken
4) there is no $DIRECTORIES variable
Pushed, thanks.
Signature · 13 lines
Cyril Hrubis [email protected] ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list