public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/maskray/clang] iconv: Use TIMEOUTFACTOR for iconv test timeout
@ 2021-11-02 19:57 Fangrui Song
0 siblings, 0 replies; only message in thread
From: Fangrui Song @ 2021-11-02 19:57 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0ff2d30daedb6d0d00401f1f2a48a80ff99d7c25
commit 0ff2d30daedb6d0d00401f1f2a48a80ff99d7c25
Author: Stafford Horne <shorne@gmail.com>
Date: Tue Oct 5 10:56:10 2021 +0900
iconv: Use TIMEOUTFACTOR for iconv test timeout
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.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diff:
---
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=$?
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-11-02 19:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-02 19:57 [glibc/maskray/clang] iconv: Use TIMEOUTFACTOR for iconv test timeout Fangrui Song
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).