From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 4 Dec 2015 13:12:33 +0000 (+0100)
Subject: tests: scsihost: Use fakerootdir instead of fakesysfsdir
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8df2f1d874bc0b1ac51b58025dc7edee9d9fea0e;p=libvirt.git

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.
---

diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c
index eb5f522623..ab3b0aec42 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;