NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: Adopt fakerootdir helpers

Browse Source 
Most replacements are completely straightforward but
vircgrouptest requires slightly different handling because,
instead of initializing a single fakerootdir at the start of
the test program and cleaning it up at the end, it creates
multiple different ones one after the other.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Andrea Bolognani
2023-03-01 10:52:14 +01:00
parent ef3b22e589
commit 457a0183d6
9 changed files with 29 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/virhostdevtest.c
View File

@@ -584,22 +584,14 @@ testNVMeDiskRoundtrip(const void *opaque G_GNUC_UNUSED)
}
# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX"
static int
mymain(void)
{
int ret = 0;
g_autofree char *fakerootdir = NULL;
fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE);
if (!g_mkdtemp(fakerootdir)) {
fprintf(stderr, "Cannot create fakerootdir");
abort();
}
g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE);
if (!(fakerootdir = virTestFakeRootDirInit()))
return EXIT_FAILURE;
# define DO_TEST(fnc) \
do { \
@@ -609,7 +601,7 @@ mymain(void)
if (myInit() < 0) {
fprintf(stderr, "Init data structures failed.");
virFileDeleteTree(fakerootdir);
virTestFakeRootDirCleanup(fakerootdir);
return EXIT_FAILURE;
}
@@ -622,8 +614,7 @@ mymain(void)
myCleanup();
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(fakerootdir);
virTestFakeRootDirCleanup(fakerootdir);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}