[PATCH] fwts-test: arg-show-progress-dialog-0001: fix armhf failures

[Keng-Yu Lin]

On Wed, Jun 11, 2014 at 6:54 PM, Colin King <colin.king at canonical.com> wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> The progress stats have more precision and show the length of
> test duration.  This however breaks the testing on armhf because
> of different floating point % progress values and also the longer
> test runs on armhf.  To accommodate these differences, I've added
> a couple of sed filters to normalise the % progress and test
> duration output so that this test will work on all architectures.
>
> Tested on armhf and amd64.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>  fwts-test/arg-show-progress-dialog-0001/test-0001.sh | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/fwts-test/arg-show-progress-dialog-0001/test-0001.sh b/fwts-test/arg-show-progress-dialog-0001/test-0001.sh
> index b6e1809..609aa8a 100755
> --- a/fwts-test/arg-show-progress-dialog-0001/test-0001.sh
> +++ b/fwts-test/arg-show-progress-dialog-0001/test-0001.sh
> @@ -3,9 +3,21 @@
>  TEST="Test --show-progress-dialog option"
>  NAME=test-0001.sh
>  TMPLOG=$TMP/progress.log.$$
> +TMPLOG_ORIG=$TMP/progress-0001.log.$$
>
> -$FWTS -w 80 --show-progress-dialog -j $FWTSTESTDIR/../data --klog=$FWTSTESTDIR/arg-show-progress-dialog-0001/klog.txt oops klog > $TMPLOG
> -diff $TMPLOG $FWTSTESTDIR/arg-show-progress-dialog-0001/progress-0001.log >> $FAILURE_LOG
> +#
> +#  Normalise % progress and seconds to run so it works OK
> +#  with different progress roundings and test durations on
> +#  different architectures.
> +#
> +fixup()
> +{
> +       sed s'X[0-9]*\.[0-9]*%X00.00%X' | sed s'X[0-9]* secondsX0 secondsX'
> +}
> +
> +$FWTS -w 80 --show-progress-dialog -j $FWTSTESTDIR/../data --klog=$FWTSTESTDIR/arg-show-progress-dialog-0001/klog.txt oops klog | fixup > $TMPLOG
> +fixup < $FWTSTESTDIR/arg-show-progress-dialog-0001/progress-0001.log > $TMPLOG_ORIG
> +diff $TMPLOG $TMPLOG_ORIG >> $FAILURE_LOG
>  ret=$?
>  if [ $ret -eq 0 ]; then
>         echo PASSED: $TEST, $NAME
> @@ -13,5 +25,5 @@ else
>         echo FAILED: $TEST, $NAME
>  fi
>
> -rm $TMPLOG
> +rm $TMPLOG $TMPLOG_ORIG
>  exit $ret
> --
> 2.0.0
>

Acked-by: Keng-Yu Lin <kengyu at canonical.com>