picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Stafford Horne 2021-10-05 10:56:10 +09:00 committed by Adhemerval Zanella
parent 4e32c8f568
commit 0ff2d30dae
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iconv/tst-iconv_prog.sh
View File

@ -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=$?
}