mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 21:34:54 +03:00
qemuxml2arvtest: Ensure newline at the end of generated .args files
The switch to internal linebreaking of arguments caused a problem when
generating .args files with VIR_TEST_REGENERATE_OUTPUT as the last
argument isn't terminated with a newline.
Switch to using virCommandToStringBuf and append a newline.
Fixes: 0046e0b1c2
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
2d018bf769
commit
9a82146fcd
@ -634,6 +634,7 @@ testCompareXMLToArgv(const void *data)
|
||||
{
|
||||
struct testQemuInfo *info = (void *) data;
|
||||
g_autofree char *migrateURI = NULL;
|
||||
g_auto(virBuffer) actualBuf = VIR_BUFFER_INITIALIZER;
|
||||
g_autofree char *actualargv = NULL;
|
||||
unsigned int flags = info->flags;
|
||||
unsigned int parseFlags = info->parseFlags;
|
||||
@ -788,9 +789,12 @@ testCompareXMLToArgv(const void *data)
|
||||
if (testCompareXMLToArgvValidateSchema(&driver, migrateURI, info, flags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!(actualargv = virCommandToString(cmd, true)))
|
||||
if (virCommandToStringBuf(cmd, &actualBuf, true, false) < 0)
|
||||
goto cleanup;
|
||||
|
||||
virBufferAddLit(&actualBuf, "\n");
|
||||
actualargv = virBufferContentAndReset(&actualBuf);
|
||||
|
||||
if (virTestCompareToFileFull(actualargv, info->outfile, false) < 0)
|
||||
goto cleanup;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user