The following commit has been merged into the core/rcu branch of tip: Commit-ID: 532017b11950a7042d130477747cced4b7e44199 Gitweb: https://git.kernel.org/tip/532017b11950a7042d130477747cced4b7e44199 Author: Paul E. McKenney <paulmck@xxxxxxxxxx> AuthorDate: Tue, 24 Nov 2020 16:28:01 -08:00 Committer: Paul E. McKenney <paulmck@xxxxxxxxxx> CommitterDate: Wed, 06 Jan 2021 17:03:41 -08:00 torture: Enable torture.sh argument checking This commit uncomments the argument checking for the --duration argument to torture.sh. While in the area, it also corrects the duration units from seconds to minutes. Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> --- tools/testing/selftests/rcutorture/bin/torture.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/rcutorture/bin/torture.sh b/tools/testing/selftests/rcutorture/bin/torture.sh index e13dacf..8e66797 100755 --- a/tools/testing/selftests/rcutorture/bin/torture.sh +++ b/tools/testing/selftests/rcutorture/bin/torture.sh @@ -157,17 +157,17 @@ do fi ;; --duration) - # checkarg --duration "(minutes)" $# "$2" '^[0-9][0-9]*\(s\|m\|h\|d\|\)$' '^error' - mult=60 - if echo "$2" | grep -q 's$' + checkarg --duration "(minutes)" $# "$2" '^[0-9][0-9]*\(m\|h\|d\|\)$' '^error' + mult=1 + if echo "$2" | grep -q 'm$' then mult=1 elif echo "$2" | grep -q 'h$' then - mult=3600 + mult=60 elif echo "$2" | grep -q 'd$' then - mult=86400 + mult=1440 fi ts=`echo $2 | sed -e 's/[smhd]$//'` duration_base=$(($ts*mult))
|