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:
parent
4e32c8f568
commit
0ff2d30dae
|
@ -32,6 +32,8 @@ $codir/iconv/iconv_prog
|
||||||
'
|
'
|
||||||
ICONV="$test_wrapper_env $run_program_env $ICONV"
|
ICONV="$test_wrapper_env $run_program_env $ICONV"
|
||||||
|
|
||||||
|
TIMEOUTFACTOR=${TIMEOUTFACTOR:-1}
|
||||||
|
|
||||||
# List of known hangs;
|
# List of known hangs;
|
||||||
# Gathered by running an exhaustive 2 byte input search against glibc-2.28
|
# Gathered by running an exhaustive 2 byte input search against glibc-2.28
|
||||||
hangarray=(
|
hangarray=(
|
||||||
|
@ -222,7 +224,8 @@ execute_test ()
|
||||||
{
|
{
|
||||||
eval PROG=\"$ICONV\"
|
eval PROG=\"$ICONV\"
|
||||||
echo -en "$twobyte" \
|
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=$?
|
ret=$?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue