[Pkg-libvirt-commits] [libguestfs] 06/87: tests/mountable: skip if btrfs is not available

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository libguestfs.

commit 8dcf8474e7c1a7a96b17f6ff3bb8a46751b26208
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Mon Dec 23 16:35:53 2013 +0100

    tests/mountable: skip if btrfs is not available
    
    This test uses btrfs, so skip it if either the "btrfs" feature or the
    btrfs filesystem is not available.
    
    (cherry picked from commit ac1d5ba77bd98c3e1fb061458254340bbdb823f2)
---
 tests/mountable/test-internal-parse-mountable.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/mountable/test-internal-parse-mountable.c b/tests/mountable/test-internal-parse-mountable.c
index ed3264e..0638fc0 100644
--- a/tests/mountable/test-internal-parse-mountable.c
+++ b/tests/mountable/test-internal-parse-mountable.c
@@ -33,6 +33,7 @@ main (int argc, char *argv[])
   guestfs_h *g;
   struct guestfs_internal_mountable *mountable;
   const char *devices[] = { "/dev/VG/LV", NULL };
+  const char *feature[] = { "btrfs", NULL };
 
   g = guestfs_create ();
   if (g == NULL) {
@@ -48,6 +49,18 @@ main (int argc, char *argv[])
 
   if (guestfs_launch (g) == -1) goto error;
 
+  if (!guestfs_feature_available (g, (char **) feature)) {
+    printf ("skipping test because btrfs is not available\n");
+    guestfs_close (g);
+    exit (77);
+  }
+
+  if (!guestfs_filesystem_available (g, "btrfs")) {
+    printf ("skipping test because btrfs filesystem is not available\n");
+    guestfs_close (g);
+    exit (77);
+  }
+
   if (guestfs_part_disk (g, "/dev/sda", "mbr") == -1) goto error;
 
   if (guestfs_pvcreate (g, "/dev/sda1") == -1) goto error;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git