From 0ff2d30daedb6d0d00401f1f2a48a80ff99d7c25 Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Tue, 5 Oct 2021 10:56:10 +0900 Subject: 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 --- iconv/tst-iconv_prog.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'iconv') 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=$? } -- cgit 1.4.1