lkml.org 
[lkml]   [2021]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH rcu 19/21] torture: Don't use "test" command's "-a" argument
    Date
    There was a time long ago when the "test" command's documentation
    claimed that the "-a" and "-o" arguments did something useful.
    But this documentation now suggests letting the shell execute
    these boolean operators, so this commit applies that suggestion to
    kvm-test-1-run-qemu.sh.

    Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
    ---
    .../selftests/rcutorture/bin/kvm-test-1-run-qemu.sh | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh
    index d828a34b5b89f..ca1d49c1c2f45 100755
    --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh
    +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh
    @@ -89,7 +89,7 @@ then
    fi
    while :
    do
    - if test -z "$qemu_pid" -a -s "$resdir/qemu-pid"
    + if test -z "$qemu_pid" && test -s "$resdir/qemu-pid"
    then
    qemu_pid=`cat "$resdir/qemu-pid"`
    fi
    @@ -122,11 +122,11 @@ do
    break
    fi
    done
    -if test -z "$qemu_pid" -a -s "$resdir/qemu-pid"
    +if test -z "$qemu_pid" && test -s "$resdir/qemu-pid"
    then
    qemu_pid=`cat "$resdir/qemu-pid"`
    fi
    -if test $commandcompleted -eq 0 -a -n "$qemu_pid"
    +if test $commandcompleted -eq 0 && test -n "$qemu_pid"
    then
    if ! test -f "$resdir/../STOP.1"
    then
    @@ -159,11 +159,11 @@ then
    then
    last_ts=0
    fi
    - if test "$newline" != "$oldline" -a "$last_ts" -lt $((seconds + $TORTURE_SHUTDOWN_GRACE))
    + if test "$newline" != "$oldline" && test "$last_ts" -lt $((seconds + $TORTURE_SHUTDOWN_GRACE))
    then
    must_continue=yes
    fi
    - if test $must_continue = no -a $kruntime -ge $((seconds + $TORTURE_SHUTDOWN_GRACE))
    + if test $must_continue = no && test $kruntime -ge $((seconds + $TORTURE_SHUTDOWN_GRACE))
    then
    echo "!!! PID $qemu_pid hung at $kruntime vs. $seconds seconds" >> $resdir/Warnings 2>&1
    kill -KILL $qemu_pid
    --
    2.31.1.189.g2e36527f23
    \
     
     \ /
      Last update: 2021-07-21 23:03    [W:4.122 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site