[U-Boot] [PATCH] test: Update test-imagetools.sh to match new syntax

[Vagrant Cascadian <vagrant@debian.org>]

On 2019-02-14, Martyn Welch wrote:
> The syntax of dumpimage was simplified in commit 12b831879a76 ("tools:
> dumpimage: Simplify arguments"), but the test
> (test/image/test-imagetools.sh) was not updated and is now failing.
>
> Update the test to use the new syntax.

This does fix the tests with the new syntax, so:

Tested-by: Vagrant Cascadian <vagrant@debian.org>


It doesn't address the changed syntax of the command. All users of
dumpimage outside of u-boot will have to update to the new syntax, and
detect the version if they for some reason need to support both old and
new dumpimage syntax. Maybe that's not a deal-breaker; I'm not sure how
to cleanly handle that.


live well,
  vagrant

> ---
>
>  test/image/test-imagetools.sh | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/test/image/test-imagetools.sh b/test/image/test-imagetools.sh
> index 256af71d42..907f46a7b5 100755
> --- a/test/image/test-imagetools.sh
> +++ b/test/image/test-imagetools.sh
> @@ -102,10 +102,10 @@ create_multi_image()
>  extract_multi_image()
>  {
>  	echo -e "\nExtracting multi-file image contents..."
> -	do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 0 ${DATAFILE0}
> -	do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 1 ${DATAFILE1}
> -	do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 2 ${DATAFILE2}
> -	do_cmd ${DUMPIMAGE} -T multi -i ${IMAGE_MULTI} -p 2 ${DATAFILE2} -o ${TEST_OUT}
> +	do_cmd ${DUMPIMAGE} -T multi -p 0 -o ${DATAFILE0} ${IMAGE_MULTI}
> +	do_cmd ${DUMPIMAGE} -T multi -p 1 -o ${DATAFILE1} ${IMAGE_MULTI}
> +	do_cmd ${DUMPIMAGE} -T multi -p 2 -o ${DATAFILE2} ${IMAGE_MULTI}
> +	do_cmd ${DUMPIMAGE} -T multi -p 2 -o ${TEST_OUT} ${IMAGE_MULTI}
>  	echo "done."
>  }
>  
> @@ -166,10 +166,10 @@ create_fit_image()
>  extract_fit_image()
>  {
>  	echo -e "\nExtracting FIT image contents..."
> -	do_cmd ${DUMPIMAGE} -T flat_dt -i ${IMAGE_FIT_ITB} -p 0 ${DATAFILE0}
> -	do_cmd ${DUMPIMAGE} -T flat_dt -i ${IMAGE_FIT_ITB} -p 1 ${DATAFILE1}
> -	do_cmd ${DUMPIMAGE} -T flat_dt -i ${IMAGE_FIT_ITB} -p 2 ${DATAFILE2}
> -	do_cmd ${DUMPIMAGE} -T flat_dt -i ${IMAGE_FIT_ITB} -p 2 ${DATAFILE2} -o ${TEST_OUT}
> +	do_cmd ${DUMPIMAGE} -T flat_dt -p 0 -o ${DATAFILE0} ${IMAGE_FIT_ITB}
> +	do_cmd ${DUMPIMAGE} -T flat_dt -p 1 -o ${DATAFILE1} ${IMAGE_FIT_ITB}
> +	do_cmd ${DUMPIMAGE} -T flat_dt -p 2 -o ${DATAFILE2} ${IMAGE_FIT_ITB}
> +	do_cmd ${DUMPIMAGE} -T flat_dt -p 2 -o ${TEST_OUT} ${IMAGE_FIT_ITB}
>  	echo "done."
>  }
>  
> -- 
> 2.20.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190219/d4382210/attachment.sig>