From: John Ferlan <jferlan@redhat.com>
Date: Wed, 30 Jan 2019 15:26:48 +0000 (-0500)
Subject: tests: Fix storagepoolxml2xmltest execution for XML namespaces
X-Git-Tag: v5.1.0-rc1~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c87c75a0cae1cb56dc3cbb7959c8c791f929853;p=thirdparty%2Flibvirt.git

tests: Fix storagepoolxml2xmltest execution for XML namespaces

Only run the pool-netfs-ns-mountopts if built WITH_STORAGE_FS and only
run pool-rbd-ns-configopts if built with WITH_STORAGE_RBD since the
namespace support is only enabled if the pool is enabled.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 90d00a8d9e..acb15f3a2c 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -91,7 +91,9 @@ mymain(void)
     DO_TEST("pool-netfs-protocol-ver");
     DO_TEST("pool-netfs-gluster");
     DO_TEST("pool-netfs-cifs");
+#ifdef WITH_STORAGE_FS
     DO_TEST("pool-netfs-ns-mountopts");
+#endif
     DO_TEST("pool-scsi");
     DO_TEST("pool-scsi-type-scsi-host");
     DO_TEST("pool-scsi-type-fc-host");
@@ -106,7 +108,9 @@ mymain(void)
     DO_TEST("pool-zfs");
     DO_TEST("pool-zfs-sourcedev");
     DO_TEST("pool-rbd");
+#ifdef WITH_STORAGE_RBD
     DO_TEST("pool-rbd-ns-configopts");
+#endif
     DO_TEST("pool-vstorage");
     DO_TEST("pool-iscsi-direct-auth");
     DO_TEST("pool-iscsi-direct");