[libvirt] [PATCH 1/3] tests: use virTestCompareToFile in storagepoolcapstest

Peter Krempa pkrempa at redhat.com
Thu Mar 7 08:08:30 UTC 2019


On Wed, Mar 06, 2019 at 19:16:46 +0100, Pavel Hrdina wrote:
> This will allow to use VIR_TEST_REGENERATE_OUTPUT.
> 
> Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> ---
>  tests/storagepoolcapstest.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c
> index d31f50c957..ade586bcdd 100644
> --- a/tests/storagepoolcapstest.c
> +++ b/tests/storagepoolcapstest.c
> @@ -68,16 +68,11 @@ test_virStoragePoolCapsFormat(const void *opaque)
>                      abs_srcdir, data->filename) < 0)
>          goto cleanup;
>  
> -    if (virFileReadAll(path, 8192, &poolCapsFromFile) < 0)
> -        goto cleanup;
> -
>      if (!(poolCapsXML = virStoragePoolCapsFormat(poolCaps)))
>          goto cleanup;
>  
> -    if (STRNEQ(poolCapsFromFile, poolCapsXML)) {
> -        virTestDifference(stderr, poolCapsFromFile, poolCapsXML);
> +    if (virTestCompareToFile(poolCapsXML, path) < 0)
>          goto cleanup;

/home/pipo/libvirt/tests/storagepoolcapstest.c:60:26: error: unused variable
      'poolCapsFromFile' [-Werror,-Wunused-variable]
    VIR_AUTOFREE(char *) poolCapsFromFile = NULL;
                         ^
ACK with the obvious fix. Also you should consider using clang as a
final test before posting.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20190307/3879e15e/attachment-0001.sig>


More information about the libvir-list mailing list