On Mon, Dec 23, 2013 at 05:06:14PM +0100, Pino Toscano wrote:
 This test uses btrfs, so skip it if either the "btrfs"
feature or the
 btrfs filesystem is not available.
 ---
  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; 
ACK.
Rich.
-- 
Richard Jones, Virtualization Group, Red Hat 
http://people.redhat.com/~rjones
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW