[LTP] [PATCH v2 1/3] tst_test.sh: Use LTP_TIMEOUT_MUL in TST_RETRY_FN()

Li Wang
2019-09-12T05:42:08Z

On Thu, Sep 12, 2019 at 12:52 AM Clemens Famulla-Conrad <
cfamullaconrad@suse.de> wrote:

> Because of timeout problems when using TST_RETRY_FN() we do now use
> LTP_TIMEOUT_MUL to adopt the timeout value.
>
> Introduced tst_adjut_timeout function to have a generic place to
> adopt timeout values.
>

What about using tst_multipy_timeout as the function name? Since it only
raises the timeout value with a multiplier.

>
> Signed-off-by: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
> ---
> testcases/lib/tst_test.sh | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
> index e0b24c6b9..03692e503 100644
> --- a/testcases/lib/tst_test.sh
> +++ b/testcases/lib/tst_test.sh
> @@ -164,7 +164,7 @@ TST_RETRY_FN_EXP_BACKOFF()
> {
> local tst_fun="$1"
> local tst_exp=$2
> - local tst_sec=$(expr $3 \* 1000000)
> + local tst_sec=$(tst_adjust_timeout $(expr $3 \* 1000000))
> local tst_delay=1
>
> if [ $# -ne 3 ]; then
> @@ -371,12 +371,16 @@ _tst_rescmp()
> fi
> }
>
> -
> -_tst_setup_timer()
> +tst_adjust_timeout()
> {
> LTP_TIMEOUT_MUL=${LTP_TIMEOUT_MUL:-1}
> + local timeout=$1
> + echo $(( timeout * LTP_TIMEOUT_MUL))
>

Shouldn't we check the LTP_TIMEOUT_MUL > 1 before using it?

--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20190912/d28e6372/attachment.htm>