From: Gary R Hook <grhookatwork@gmail.com>
Date: Fri, 16 Jan 2015 17:38:32 +0000 (+0000)
Subject: Make ZFS storage pool XML tests optional
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e11490e358e8d00877fe3fd2006238ecb315b347;p=libvirt.git

Make ZFS storage pool XML tests optional

Do not run ZFS tests when ZFS is unsupported in the environment.

The recent patch b4af40226d09adeaf9e33a1d6594c4e8ce7f771d adds tests
to storagepoolxml2xmltest for the optional ZFS feature. When ZFS is
not included in the configuration these tests should not / cannot be
run. Modify the test source file to check for use of the feature and
compile in the tests accordingly.

Signed-off-by: Gary R Hook <gary.hook@nimboxx.com>
---

diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 52e2193e83..270f75d982 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -106,8 +106,10 @@ mymain(void)
     DO_TEST("pool-gluster");
     DO_TEST("pool-gluster-sub");
     DO_TEST("pool-scsi-type-scsi-host-stable");
+#ifdef WITH_STORAGE_ZFS
     DO_TEST("pool-zfs");
     DO_TEST("pool-zfs-sourcedev");
+#endif
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }