]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Fix PKI directory used for QEMU test suite
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 7 Feb 2013 16:39:16 +0000 (16:39 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 8 Feb 2013 11:34:25 +0000 (11:34 +0000)
The data files for testing QEMU command line generation are
hardcoded to use /etc/pki, so we should explicitly set that
in the test case, avoiding the dynamic SYSCONFDIR value.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
tests/qemuxml2argvtest.c

index 938dc326da8a84c8a8448e4c69c156156fc6abe7..01554a318ef6de672f3dc7dd83e78e9a16a1209c 100644 (file)
@@ -285,6 +285,13 @@ mymain(void)
     VIR_FREE(driver.config->spiceListen);
     VIR_FREE(driver.config->vncListen);
 
+    VIR_FREE(driver.config->vncTLSx509certdir);
+    if ((driver.config->vncTLSx509certdir = strdup("/etc/pki/libvirt-vnc")) == NULL)
+        return EXIT_FAILURE;
+    VIR_FREE(driver.config->spiceTLSx509certdir);
+    if ((driver.config->spiceTLSx509certdir = strdup("/etc/pki/libvirt-spice")) == NULL)
+        return EXIT_FAILURE;
+
     if ((driver.caps = testQemuCapsInit()) == NULL)
         return EXIT_FAILURE;
     VIR_FREE(driver.config->stateDir);