Skip to content

Commit bee6f21

Browse files
committed
torture: Drop trailing ^M from console output
Console logs can sometimes have trailing control-M characters, which the forward-progress evaluation code in kvm-recheck-rcu.sh passes through to the user output. Which does not cause a technical problem, but which can look ugly. This commit therefore strips the control-M characters. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
1 parent da12301 commit bee6f21

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ stopstate="`grep 'End-test grace-period state: g' $i/console.log 2> /dev/null |
2525
tail -1 | sed -e 's/^\[[ 0-9.]*] //' |
2626
awk '{ print \"[\" $1 \" \" $5 \" \" $6 \" \" $7 \"]\"; }' |
2727
tr -d '\012\015'`"
28-
fwdprog="`grep 'rcu_torture_fwd_prog n_max_cbs: ' $i/console.log 2> /dev/null | sed -e 's/^\[[^]]*] //' | sort -k3nr | head -1 | awk '{ print $2 " " $3 }'`"
28+
fwdprog="`grep 'rcu_torture_fwd_prog n_max_cbs: ' $i/console.log 2> /dev/null | sed -e 's/^\[[^]]*] //' | sort -k3nr | head -1 | awk '{ print $2 " " $3 }' | tr -d '\015'`"
2929
if test -z "$ngps"
3030
then
3131
echo "$configfile ------- " $stopstate

0 commit comments

Comments
 (0)