From 8df2f1d874bc0b1ac51b58025dc7edee9d9fea0e Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Fri, 4 Dec 2015 14:12:33 +0100 Subject: [PATCH] tests: scsihost: Use fakerootdir instead of fakesysfsdir This updates the test program to make it consistent with recent changes to the mock libraries, and also opens up the possibility of mocking more than just /sys in the future. --- tests/scsihosttest.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index eb5f52262..ab3b0aec4 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -244,21 +244,27 @@ testVirFindSCSIHostByPCI(const void *data ATTRIBUTE_UNUSED) return ret; } -# define FAKESYSFSDIRTEMPLATE abs_builddir "/fakesysfsdir-XXXXXX" +# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" static int mymain(void) { int ret = -1; + char *fakerootdir = NULL; char *fakesysfsdir = NULL; - if (VIR_STRDUP_QUIET(fakesysfsdir, FAKESYSFSDIRTEMPLATE) < 0) { + if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { fprintf(stderr, "Out of memory\n"); goto cleanup; } - if (!mkdtemp(fakesysfsdir)) { - fprintf(stderr, "Cannot create fakesysfsdir"); + if (!mkdtemp(fakerootdir)) { + fprintf(stderr, "Cannot create fakerootdir"); + goto cleanup; + } + + if (virAsprintfQuiet(&fakesysfsdir, "%s/sys", fakerootdir) < 0) { + fprintf(stderr, "Out of memory\n"); goto cleanup; } @@ -290,7 +296,8 @@ mymain(void) cleanup: if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) - virFileDeleteTree(fakesysfsdir); + virFileDeleteTree(fakerootdir); + VIR_FREE(fakerootdir); VIR_FREE(fakesysfsdir); VIR_FREE(scsihost_class_path); return ret; -- 2.39.5