The following commit has been merged into the core/rcu branch of tip: Commit-ID: 5ae5f7453f93b21e06296e78e8481ba8baaaa55e Gitweb: https://git.kernel.org/tip/5ae5f7453f93b21e06296e78e8481ba8baaaa55e Author: Paul E. McKenney <paulmck@xxxxxxxxxx> AuthorDate: Thu, 26 Nov 2020 21:27:27 -08:00 Committer: Paul E. McKenney <paulmck@xxxxxxxxxx> CommitterDate: Wed, 06 Jan 2021 17:03:45 -08:00 torture: Drop log.long generation from torture.sh Now that kvm.sh puts all the relevant details in the "log" file, there is no need for torture.sh to generate a separate "log.long" file. This commit therefore drops this from torture.sh. Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> --- tools/testing/selftests/rcutorture/bin/torture.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/testing/selftests/rcutorture/bin/torture.sh b/tools/testing/selftests/rcutorture/bin/torture.sh index 43ef2c0..cf74123 100755 --- a/tools/testing/selftests/rcutorture/bin/torture.sh +++ b/tools/testing/selftests/rcutorture/bin/torture.sh @@ -203,11 +203,8 @@ function torture_one { "$@" $boottag "$cur_bootargs" --datestamp "$ds/results-$curflavor" > $T/$curflavor.out 2>&1 retcode=$? resdir="`grep '^Results directory: ' $T/$curflavor.out | tail -1 | sed -e 's/^Results directory: //'`" - if test -n "$resdir" + if test -z "$resdir" then - cp $T/$curflavor.out $resdir/log.long - echo retcode=$retcode >> $resdir/log.long - else cat $T/$curflavor.out | tee -a $T/log echo retcode=$retcode | tee -a $T/log fi
![]() |