* [PATCH] iconv: Use TIMEOUTFACTOR for iconv test timeout
@ 2021-10-05 1:56 Stafford Horne
2021-10-20 21:22 ` Stafford Horne
0 siblings, 1 reply; 3+ messages in thread
From: Stafford Horne @ 2021-10-05 1:56 UTC (permalink / raw)
To: GLIBC patches
Currently the timeout for each iconv test is hard coded to 3 seconds.
On my OpenRISC test platform this is too slow and the test fails with a
HANG error.
This change uses the available TIMEOUTFACTOR to compute the timeout.
The default value is still 3.
---
iconv/tst-iconv_prog.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/iconv/tst-iconv_prog.sh b/iconv/tst-iconv_prog.sh
index 14b7c08c91..2505f0f371 100644
--- a/iconv/tst-iconv_prog.sh
+++ b/iconv/tst-iconv_prog.sh
@@ -32,6 +32,8 @@ $codir/iconv/iconv_prog
'
ICONV="$test_wrapper_env $run_program_env $ICONV"
+TIMEOUTFACTOR=${TIMEOUTFACTOR:-1}
+
# List of known hangs;
# Gathered by running an exhaustive 2 byte input search against glibc-2.28
hangarray=(
@@ -222,7 +224,8 @@ execute_test ()
{
eval PROG=\"$ICONV\"
echo -en "$twobyte" \
- | timeout -k 4 3 $PROG $c -f $from -t "$to" &>/dev/null
+ | timeout -k 4 $((3*$TIMEOUTFACTOR)) \
+ $PROG $c -f $from -t "$to" &>/dev/null
ret=$?
}
--
2.31.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iconv: Use TIMEOUTFACTOR for iconv test timeout
2021-10-05 1:56 [PATCH] iconv: Use TIMEOUTFACTOR for iconv test timeout Stafford Horne
@ 2021-10-20 21:22 ` Stafford Horne
2021-10-21 14:17 ` Adhemerval Zanella
0 siblings, 1 reply; 3+ messages in thread
From: Stafford Horne @ 2021-10-20 21:22 UTC (permalink / raw)
To: GLIBC patches
Ping,
And by the way, Am I allowed to push upstream trivial fixes like this
without review? I think reviewing should be mandatory, but some
projects feel different.
On Tue, Oct 5, 2021 at 10:56 AM Stafford Horne <shorne@gmail.com> wrote:
>
> Currently the timeout for each iconv test is hard coded to 3 seconds.
> On my OpenRISC test platform this is too slow and the test fails with a
> HANG error.
>
> This change uses the available TIMEOUTFACTOR to compute the timeout.
> The default value is still 3.
> ---
> iconv/tst-iconv_prog.sh | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/iconv/tst-iconv_prog.sh b/iconv/tst-iconv_prog.sh
> index 14b7c08c91..2505f0f371 100644
> --- a/iconv/tst-iconv_prog.sh
> +++ b/iconv/tst-iconv_prog.sh
> @@ -32,6 +32,8 @@ $codir/iconv/iconv_prog
> '
> ICONV="$test_wrapper_env $run_program_env $ICONV"
>
> +TIMEOUTFACTOR=${TIMEOUTFACTOR:-1}
> +
> # List of known hangs;
> # Gathered by running an exhaustive 2 byte input search against glibc-2.28
> hangarray=(
> @@ -222,7 +224,8 @@ execute_test ()
> {
> eval PROG=\"$ICONV\"
> echo -en "$twobyte" \
> - | timeout -k 4 3 $PROG $c -f $from -t "$to" &>/dev/null
> + | timeout -k 4 $((3*$TIMEOUTFACTOR)) \
> + $PROG $c -f $from -t "$to" &>/dev/null
> ret=$?
> }
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iconv: Use TIMEOUTFACTOR for iconv test timeout
2021-10-20 21:22 ` Stafford Horne
@ 2021-10-21 14:17 ` Adhemerval Zanella
0 siblings, 0 replies; 3+ messages in thread
From: Adhemerval Zanella @ 2021-10-21 14:17 UTC (permalink / raw)
To: Stafford Horne, GLIBC patches
On 20/10/2021 18:22, Stafford Horne via Libc-alpha wrote:
> Ping,
>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> And by the way, Am I allowed to push upstream trivial fixes like this
> without review? I think reviewing should be mandatory, but some
> projects feel different.
I think the current approach is to still send trivial patches upstream
and after some time announce that you intend to push. The main problem
is sometime is hard to define what is 'trivial' fixes.
>
> On Tue, Oct 5, 2021 at 10:56 AM Stafford Horne <shorne@gmail.com> wrote:
>>
>> Currently the timeout for each iconv test is hard coded to 3 seconds.
>> On my OpenRISC test platform this is too slow and the test fails with a
>> HANG error.
>>
>> This change uses the available TIMEOUTFACTOR to compute the timeout.
>> The default value is still 3.
>> ---
>> iconv/tst-iconv_prog.sh | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/iconv/tst-iconv_prog.sh b/iconv/tst-iconv_prog.sh
>> index 14b7c08c91..2505f0f371 100644
>> --- a/iconv/tst-iconv_prog.sh
>> +++ b/iconv/tst-iconv_prog.sh
>> @@ -32,6 +32,8 @@ $codir/iconv/iconv_prog
>> '
>> ICONV="$test_wrapper_env $run_program_env $ICONV"
>>
>> +TIMEOUTFACTOR=${TIMEOUTFACTOR:-1}
>> +
>> # List of known hangs;
>> # Gathered by running an exhaustive 2 byte input search against glibc-2.28
>> hangarray=(
>> @@ -222,7 +224,8 @@ execute_test ()
>> {
>> eval PROG=\"$ICONV\"
>> echo -en "$twobyte" \
>> - | timeout -k 4 3 $PROG $c -f $from -t "$to" &>/dev/null
>> + | timeout -k 4 $((3*$TIMEOUTFACTOR)) \
>> + $PROG $c -f $from -t "$to" &>/dev/null
>> ret=$?
>> }
>>
>> --
>> 2.31.1
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-21 14:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 1:56 [PATCH] iconv: Use TIMEOUTFACTOR for iconv test timeout Stafford Horne
2021-10-20 21:22 ` Stafford Horne
2021-10-21 14:17 ` Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).