From 7315189ec063e7bae5c58a469991827b47d9a333 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 1 Jul 2014 15:23:36 +0200 Subject: [PATCH] vboxsnapshotxmltest: Don't write to a file in abs_srcdir In the test, the snapshot XML is written into a file that's located under: abs_srcdir/vboxsnapshotxmldata/testResult.vbox However, the abs_srcdir doesn't have to be necessarily writable. It should have been abs_builddir instead. Moreover, the label in the func creating the file is called 'fail' while it fulfils the duty of 'cleanup' label. Signed-off-by: Michal Privoznik --- tests/vboxsnapshotxmltest.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index 7795688e61..4ee75375c2 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -59,38 +59,41 @@ testCompareXMLtoXMLFiles(const char *xml) char *pathResult = NULL; int ret = -1; virVBoxSnapshotConfMachinePtr machine = NULL; - if (virAsprintf(&pathResult, "%s/vboxsnapshotxmldata/testResult.vbox", - abs_srcdir) < 0) + + if (VIR_STRDUP(pathResult, + abs_builddir "/vboxsnapshotxmldata/testResult.vbox") < 0) return -1; + if (virFileMakePath(abs_builddir "/vboxsnapshotxmldata") < 0) + goto cleanup; + if (virtTestLoadFile(xml, &xmlData) < 0) - goto fail; + goto cleanup; if (!(machine = virVBoxSnapshotConfLoadVboxFile(xml, (char*)""))) - goto fail; + goto cleanup; if (virVBoxSnapshotConfSaveVboxFile(machine, pathResult) < 0) - goto fail; + goto cleanup; if (virtTestLoadFile(pathResult, &actual) < 0) - goto fail; - - if (unlink(pathResult) < 0) - goto fail; + goto cleanup; if (!(actual = testFilterXML(actual))) - goto fail; + goto cleanup; if (!(xmlData = testFilterXML(xmlData))) - goto fail; + goto cleanup; if (STRNEQ(actual, xmlData)) { virtTestDifference(stderr, xmlData, actual); - goto fail; + goto cleanup; } ret = 0; - fail: + cleanup: + unlink(pathResult); + rmdir(abs_builddir "/vboxsnapshotxmldata"); VIR_FREE(xmlData); VIR_FREE(actual); virVBoxSnapshotConfMachineFree(machine); -- GitLab