X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tests.c;h=f551e98568de2e71eb99b2b1a98d59c6bfe1dc96;hp=a8564e1ed9acddef5b8c8fa26a747fee18c71906;hb=ca49c50e06834bbc68e21630a5552c57494f2b53;hpb=6f0b962724a087a11edb5ce47aa06fa276fcb54b

diff --git a/tests.c b/tests.c
index a8564e1..f551e98 100644
--- a/tests.c
+++ b/tests.c
@@ -72,6 +72,8 @@ static void no_test_warnings (void)
   fprintf (stderr, "warning: \"guestfs_get_qemu\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_set_path\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_get_path\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_append\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_append\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_set_autosync\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_get_autosync\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_set_verbose\" has no tests\n");
@@ -83,6 +85,7 @@ static void no_test_warnings (void)
   fprintf (stderr, "warning: \"guestfs_get_state\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_set_busy\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_set_ready\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_end_busy\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_ll\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_pvs_full\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_vgs_full\" has no tests\n");
@@ -104,8 +107,6 @@ static void no_test_warnings (void)
   fprintf (stderr, "warning: \"guestfs_chown\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_sfdisk\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_lvm_remove_all\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_command\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_command_lines\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_tune2fs_l\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_blockdev_setbsz\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_tar_out\" has no tests\n");
@@ -115,11 +116,19 @@ static void no_test_warnings (void)
   fprintf (stderr, "warning: \"guestfs_debug\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_get_e2label\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_get_e2uuid\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_pvresize\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sfdisk_N\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sfdisk_l\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sfdisk_kernel_geometry\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sfdisk_disk_geometry\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_vg_activate_all\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_vg_activate\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_resize2fs\" has no tests\n");
 }
 
-static int test_equal_0 (void)
+static int test_lvresize_0 (void)
 {
-  /* InitBasicFS for equal (0): create ext2 on /dev/sda1 */
+  /* InitNone|InitEmpty for test_lvresize_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -143,6 +152,8 @@ static int test_equal_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutput for lvresize (0) */
+  char expected[] = "test content";
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -158,18 +169,48 @@ static int test_equal_0 (void)
       return -1;
   }
   {
-    char fstype[] = "ext2";
     char device[] = "/dev/sda1";
     device[5] = devchar;
     int r;
     suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 10);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/VG/LV";
+    int r;
+    suppress_error = 0;
     r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
+    char device[] = "/dev/VG/LV";
     char mountpoint[] = "/";
     int r;
     suppress_error = 0;
@@ -177,10 +218,9 @@ static int test_equal_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for equal (0) */
   {
-    char path[] = "/file1";
-    char content[] = "contents of a file";
+    char path[] = "/new";
+    char content[] = "test content";
     int r;
     suppress_error = 0;
     r = guestfs_write_file (g, path, content, 0);
@@ -188,33 +228,57 @@ static int test_equal_0 (void)
       return -1;
   }
   {
-    char src[] = "/file1";
-    char dest[] = "/file2";
+    char pathordevice[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_cp (g, src, dest);
+    r = guestfs_umount (g, pathordevice);
     if (r == -1)
       return -1;
   }
   {
-    char file1[] = "/file1";
-    char file2[] = "/file2";
+    char device[] = "/dev/VG/LV";
     int r;
     suppress_error = 0;
-    r = guestfs_equal (g, file1, file2);
+    r = guestfs_lvresize (g, device, 20);
     if (r == -1)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_equal_0: expected true, got false\n");
+  }
+  {
+    char device[] = "/dev/VG/LV";
+    int r;
+    suppress_error = 0;
+    r = guestfs_resize2fs (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/VG/LV";
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_lvresize_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
   return 0;
 }
 
-static int test_equal_1 (void)
+static int test_zerofree_0 (void)
 {
-  /* InitBasicFS for equal (1): create ext2 on /dev/sda1 */
+  /* InitNone|InitEmpty for test_zerofree_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -238,6 +302,8 @@ static int test_equal_1 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutput for zerofree (0) */
+  char expected[] = "test file";
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -253,7 +319,7 @@ static int test_equal_1 (void)
       return -1;
   }
   {
-    char fstype[] = "ext2";
+    char fstype[] = "ext3";
     char device[] = "/dev/sda1";
     device[5] = devchar;
     int r;
@@ -272,10 +338,9 @@ static int test_equal_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputFalse for equal (1) */
   {
-    char path[] = "/file1";
-    char content[] = "contents of a file";
+    char path[] = "/new";
+    char content[] = "test file";
     int r;
     suppress_error = 0;
     r = guestfs_write_file (g, path, content, 0);
@@ -283,33 +348,52 @@ static int test_equal_1 (void)
       return -1;
   }
   {
-    char path[] = "/file2";
-    char content[] = "contents of another file";
+    char pathordevice[] = "/dev/sda1";
+    pathordevice[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_umount (g, pathordevice);
     if (r == -1)
       return -1;
   }
   {
-    char file1[] = "/file1";
-    char file2[] = "/file2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_equal (g, file1, file2);
+    r = guestfs_zerofree (g, device);
     if (r == -1)
       return -1;
-    if (r) {
-      fprintf (stderr, "test_equal_1: expected false, got true\n");
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_zerofree_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
   return 0;
 }
 
-static int test_equal_2 (void)
+static int test_hexdump_0 (void)
 {
-  /* InitBasicFS for equal (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_hexdump_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -367,22 +451,36 @@ static int test_equal_2 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for equal (2) */
+  /* TestOutput for hexdump (0) */
+  char expected[] = "00000000  68 65 6c 6c 6f 0a 77 6f  72 6c 64 0a              |hello.world.|\n0000000c\n";
   {
-    char file1[] = "/file1";
-    char file2[] = "/file2";
+    char path[] = "/new";
+    char content[] = "hello\nworld\n";
     int r;
-    suppress_error = 1;
-    r = guestfs_equal (g, file1, file2);
-    if (r != -1)
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 12);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_hexdump (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_hexdump_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
+    }
+    free (r);
   }
   return 0;
 }
 
-static int test_ping_daemon_0 (void)
+static int test_strings_e_0 (void)
 {
-  /* InitEmpty for ping_daemon (0) */
+  /* InitBasicFS for test_strings_e_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -406,95 +504,80 @@ static int test_ping_daemon_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestRun for ping_daemon (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_ping_daemon (g);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
-  return 0;
-}
-
-static int test_dmesg_0 (void)
-{
-  /* InitEmpty for dmesg (0) */
   {
-    char device[] = "/dev/sda";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for strings_e (0) */
   {
+    char path[] = "/new";
+    char content[] = "hello\nworld\n";
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
-  /* TestRun for dmesg (0) */
   {
-    char *r;
+    char encoding[] = "b";
+    char path[] = "/new";
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_dmesg (g);
+    r = guestfs_strings_e (g, encoding, path);
     if (r == NULL)
       return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_strings_e_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_drop_caches_0 (void)
+static int test_strings_e_1 (void)
 {
-  /* InitEmpty for drop_caches (0) */
-  {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    int r;
-    suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_umount_all (g);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
-    if (r == -1)
-      return -1;
-  }
-  /* TestRun for drop_caches (0) */
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_drop_caches (g, 3);
-    if (r == -1)
-      return -1;
-  }
+  printf ("%s skipped (reason: test disabled in generator)\n", "test_strings_e_1");
   return 0;
 }
 
-static int test_mv_0 (void)
+static int test_strings_0 (void)
 {
-  /* InitBasicFS for mv (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_strings_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -552,11 +635,10 @@ static int test_mv_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for mv (0) */
-  char expected[] = "file content";
+  /* TestOutputList for strings (0) */
   {
-    char path[] = "/old";
-    char content[] = "file content";
+    char path[] = "/new";
+    char content[] = "hello\nworld\n";
     int r;
     suppress_error = 0;
     r = guestfs_write_file (g, path, content, 0);
@@ -564,33 +646,52 @@ static int test_mv_0 (void)
       return -1;
   }
   {
-    char src[] = "/old";
-    char dest[] = "/new";
-    int r;
-    suppress_error = 0;
-    r = guestfs_mv (g, src, dest);
-    if (r == -1)
-      return -1;
-  }
-  {
     char path[] = "/new";
-    char *r;
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_cat (g, path);
+    r = guestfs_strings (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_mv_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (!r[0]) {
+      fprintf (stderr, "test_strings_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "hello";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_strings_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_strings_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "world";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_strings_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_strings_0: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_mv_1 (void)
+static int test_strings_1 (void)
 {
-  /* InitBasicFS for mv (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_strings_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -648,43 +749,38 @@ static int test_mv_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputFalse for mv (1) */
+  /* TestOutputList for strings (1) */
   {
-    char path[] = "/old";
-    char content[] = "file content";
-    int r;
-    suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
-    if (r == -1)
-      return -1;
-  }
-  {
-    char src[] = "/old";
-    char dest[] = "/new";
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mv (g, src, dest);
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/old";
-    int r;
+    char path[] = "/new";
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_is_file (g, path);
-    if (r == -1)
+    r = guestfs_strings (g, path);
+    if (r == NULL)
       return -1;
-    if (r) {
-      fprintf (stderr, "test_mv_1: expected false, got true\n");
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_strings_1: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
   }
   return 0;
 }
 
-static int test_cp_a_0 (void)
+static int test_equal_0 (void)
 {
-  /* InitBasicFS for cp_a (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_equal_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -742,61 +838,44 @@ static int test_cp_a_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for cp_a (0) */
-  char expected[] = "file content";
-  {
-    char path[] = "/olddir";
-    int r;
-    suppress_error = 0;
-    r = guestfs_mkdir (g, path);
-    if (r == -1)
-      return -1;
-  }
+  /* TestOutputTrue for equal (0) */
   {
-    char path[] = "/newdir";
+    char path[] = "/file1";
+    char content[] = "contents of a file";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, path);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/olddir/file";
-    char content[] = "file content";
+    char src[] = "/file1";
+    char dest[] = "/file2";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_cp (g, src, dest);
     if (r == -1)
       return -1;
   }
   {
-    char src[] = "/olddir";
-    char dest[] = "/newdir";
+    char file1[] = "/file1";
+    char file2[] = "/file2";
     int r;
     suppress_error = 0;
-    r = guestfs_cp_a (g, src, dest);
+    r = guestfs_equal (g, file1, file2);
     if (r == -1)
       return -1;
-  }
-  {
-    char path[] = "/newdir/olddir/file";
-    char *r;
-    suppress_error = 0;
-    r = guestfs_cat (g, path);
-    if (r == NULL)
-      return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_cp_a_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (!r) {
+      fprintf (stderr, "test_equal_0: expected true, got false\n");
       return -1;
     }
-    free (r);
   }
   return 0;
 }
 
-static int test_cp_0 (void)
+static int test_equal_1 (void)
 {
-  /* InitBasicFS for cp (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_equal_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -854,11 +933,10 @@ static int test_cp_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for cp (0) */
-  char expected[] = "file content";
+  /* TestOutputFalse for equal (1) */
   {
-    char path[] = "/old";
-    char content[] = "file content";
+    char path[] = "/file1";
+    char content[] = "contents of a file";
     int r;
     suppress_error = 0;
     r = guestfs_write_file (g, path, content, 0);
@@ -866,33 +944,33 @@ static int test_cp_0 (void)
       return -1;
   }
   {
-    char src[] = "/old";
-    char dest[] = "/new";
+    char path[] = "/file2";
+    char content[] = "contents of another file";
     int r;
     suppress_error = 0;
-    r = guestfs_cp (g, src, dest);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/new";
-    char *r;
+    char file1[] = "/file1";
+    char file2[] = "/file2";
+    int r;
     suppress_error = 0;
-    r = guestfs_cat (g, path);
-    if (r == NULL)
+    r = guestfs_equal (g, file1, file2);
+    if (r == -1)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_cp_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (r) {
+      fprintf (stderr, "test_equal_1: expected false, got true\n");
       return -1;
     }
-    free (r);
   }
   return 0;
 }
 
-static int test_cp_1 (void)
+static int test_equal_2 (void)
 {
-  /* InitBasicFS for cp (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_equal_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -950,43 +1028,59 @@ static int test_cp_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for cp (1) */
+  /* TestLastFail for equal (2) */
   {
-    char path[] = "/old";
-    char content[] = "file content";
+    char file1[] = "/file1";
+    char file2[] = "/file2";
+    int r;
+    suppress_error = 1;
+    r = guestfs_equal (g, file1, file2);
+    if (r != -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_ping_daemon_0 (void)
+{
+  /* InitNone|InitEmpty for test_ping_daemon_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_blockdev_setrw (g, device);
     if (r == -1)
       return -1;
   }
   {
-    char src[] = "/old";
-    char dest[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_cp (g, src, dest);
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/old";
     int r;
     suppress_error = 0;
-    r = guestfs_is_file (g, path);
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_cp_1: expected true, got false\n");
+  }
+  /* TestRun for ping_daemon (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_ping_daemon (g);
+    if (r == -1)
       return -1;
-    }
   }
   return 0;
 }
 
-static int test_cp_2 (void)
+static int test_dmesg_0 (void)
 {
-  /* InitBasicFS for cp (2): create ext2 on /dev/sda1 */
+  /* InitNone|InitEmpty for test_dmesg_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1010,87 +1104,58 @@ static int test_cp_2 (void)
     if (r == -1)
       return -1;
   }
+  /* TestRun for dmesg (0) */
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    char lines_0[] = ",";
-    char *lines[] = {
-      lines_0,
-      NULL
-    };
-    int r;
-    suppress_error = 0;
-    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
-    if (r == -1)
-      return -1;
-  }
-  {
-    char fstype[] = "ext2";
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    int r;
+    char *r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, fstype, device);
-    if (r == -1)
+    r = guestfs_dmesg (g);
+    if (r == NULL)
       return -1;
+    free (r);
   }
+  return 0;
+}
+
+static int test_drop_caches_0 (void)
+{
+  /* InitNone|InitEmpty for test_drop_caches_0 */
   {
-    char device[] = "/dev/sda1";
+    char device[] = "/dev/sda";
     device[5] = devchar;
-    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, device, mountpoint);
+    r = guestfs_blockdev_setrw (g, device);
     if (r == -1)
       return -1;
   }
-  /* TestOutput for cp (2) */
-  char expected[] = "file content";
   {
-    char path[] = "/old";
-    char content[] = "file content";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/dir";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, path);
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
+  /* TestRun for drop_caches (0) */
   {
-    char src[] = "/old";
-    char dest[] = "/dir/new";
     int r;
     suppress_error = 0;
-    r = guestfs_cp (g, src, dest);
+    r = guestfs_drop_caches (g, 3);
     if (r == -1)
       return -1;
   }
-  {
-    char path[] = "/dir/new";
-    char *r;
-    suppress_error = 0;
-    r = guestfs_cat (g, path);
-    if (r == NULL)
-      return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_cp_2: expected \"%s\" but got \"%s\"\n", expected, r);
-      return -1;
-    }
-    free (r);
-  }
   return 0;
 }
 
-static int test_grub_install_0 (void)
+static int test_mv_0 (void)
 {
-  /* InitBasicFS for grub_install (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mv_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1148,35 +1213,45 @@ static int test_grub_install_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for grub_install (0) */
+  /* TestOutput for mv (0) */
+  char expected[] = "file content";
   {
-    char root[] = "/";
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
+    char path[] = "/old";
+    char content[] = "file content";
     int r;
     suppress_error = 0;
-    r = guestfs_grub_install (g, root, device);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/boot";
+    char src[] = "/old";
+    char dest[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, path);
+    r = guestfs_mv (g, src, dest);
     if (r == -1)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_grub_install_0: expected true, got false\n");
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_mv_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
   return 0;
 }
 
-static int test_zero_0 (void)
+static int test_mv_1 (void)
 {
-  /* InitBasicFS for zero (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mv_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1234,46 +1309,43 @@ static int test_zero_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for zero (0) */
-  char expected[] = "data";
+  /* TestOutputFalse for mv (1) */
   {
-    char pathordevice[] = "/dev/sda1";
-    pathordevice[5] = devchar;
+    char path[] = "/old";
+    char content[] = "file content";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, pathordevice);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
+    char src[] = "/old";
+    char dest[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_zero (g, device);
+    r = guestfs_mv (g, src, dest);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/dev/sda1";
-    path[5] = devchar;
-    char *r;
-    suppress_error = 0;
-    r = guestfs_file (g, path);
-    if (r == NULL)
+    char path[] = "/old";
+    int r;
+    suppress_error = 0;
+    r = guestfs_is_file (g, path);
+    if (r == -1)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_zero_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (r) {
+      fprintf (stderr, "test_mv_1: expected false, got true\n");
       return -1;
     }
-    free (r);
   }
   return 0;
 }
 
-static int test_fsck_0 (void)
+static int test_cp_a_0 (void)
 {
-  /* InitBasicFS for fsck (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_a_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1331,36 +1403,61 @@ static int test_fsck_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputInt for fsck (0) */
+  /* TestOutput for cp_a (0) */
+  char expected[] = "file content";
   {
-    char pathordevice[] = "/dev/sda1";
-    pathordevice[5] = devchar;
+    char path[] = "/olddir";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, pathordevice);
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
-    char fstype[] = "ext2";
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
+    char path[] = "/newdir";
     int r;
     suppress_error = 0;
-    r = guestfs_fsck (g, fstype, device);
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
-    if (r != 0) {
-      fprintf (stderr, "test_fsck_0: expected 0 but got %d\n",               (int) r);
+  }
+  {
+    char path[] = "/olddir/file";
+    char content[] = "file content";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/olddir";
+    char dest[] = "/newdir";
+    int r;
+    suppress_error = 0;
+    r = guestfs_cp_a (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/newdir/olddir/file";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_cp_a_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
   return 0;
 }
 
-static int test_fsck_1 (void)
+static int test_cp_0 (void)
 {
-  /* InitBasicFS for fsck (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1418,45 +1515,45 @@ static int test_fsck_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputInt for fsck (1) */
+  /* TestOutput for cp (0) */
+  char expected[] = "file content";
   {
-    char pathordevice[] = "/dev/sda1";
-    pathordevice[5] = devchar;
+    char path[] = "/old";
+    char content[] = "file content";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, pathordevice);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
+    char src[] = "/old";
+    char dest[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_zero (g, device);
+    r = guestfs_cp (g, src, dest);
     if (r == -1)
       return -1;
   }
   {
-    char fstype[] = "ext2";
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    int r;
+    char path[] = "/new";
+    char *r;
     suppress_error = 0;
-    r = guestfs_fsck (g, fstype, device);
-    if (r == -1)
+    r = guestfs_cat (g, path);
+    if (r == NULL)
       return -1;
-    if (r != 8) {
-      fprintf (stderr, "test_fsck_1: expected 8 but got %d\n",               (int) r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_cp_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
   return 0;
 }
 
-static int test_set_e2uuid_0 (void)
+static int test_cp_1 (void)
 {
-  /* InitBasicFS for set_e2uuid (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1514,38 +1611,43 @@ static int test_set_e2uuid_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for set_e2uuid (0) */
-  char expected[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d";
+  /* TestOutputTrue for cp (1) */
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    char uuid[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d";
+    char path[] = "/old";
+    char content[] = "file content";
     int r;
     suppress_error = 0;
-    r = guestfs_set_e2uuid (g, device, uuid);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    char *r;
+    char src[] = "/old";
+    char dest[] = "/new";
+    int r;
     suppress_error = 0;
-    r = guestfs_get_e2uuid (g, device);
-    if (r == NULL)
+    r = guestfs_cp (g, src, dest);
+    if (r == -1)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_set_e2uuid_0: expected \"%s\" but got \"%s\"\n", expected, r);
+  }
+  {
+    char path[] = "/old";
+    int r;
+    suppress_error = 0;
+    r = guestfs_is_file (g, path);
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_cp_1: expected true, got false\n");
       return -1;
     }
-    free (r);
   }
   return 0;
 }
 
-static int test_set_e2uuid_1 (void)
+static int test_cp_2 (void)
 {
-  /* InitBasicFS for set_e2uuid (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1603,28 +1705,43 @@ static int test_set_e2uuid_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for set_e2uuid (1) */
-  char expected[] = "";
+  /* TestOutput for cp (2) */
+  char expected[] = "file content";
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    char uuid[] = "clear";
+    char path[] = "/old";
+    char content[] = "file content";
     int r;
     suppress_error = 0;
-    r = guestfs_set_e2uuid (g, device, uuid);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
+    char path[] = "/dir";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkdir (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/old";
+    char dest[] = "/dir/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_cp (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/dir/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_get_e2uuid (g, device);
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
     if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_set_e2uuid_1: expected \"%s\" but got \"%s\"\n", expected, r);
+      fprintf (stderr, "test_cp_2: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1632,9 +1749,9 @@ static int test_set_e2uuid_1 (void)
   return 0;
 }
 
-static int test_set_e2uuid_2 (void)
+static int test_grub_install_0 (void)
 {
-  /* InitBasicFS for set_e2uuid (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_grub_install_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1692,23 +1809,35 @@ static int test_set_e2uuid_2 (void)
     if (r == -1)
       return -1;
   }
-  /* TestRun for set_e2uuid (2) */
+  /* TestOutputTrue for grub_install (0) */
   {
+    char root[] = "/";
     char device[] = "/dev/sda1";
     device[5] = devchar;
-    char uuid[] = "random";
     int r;
     suppress_error = 0;
-    r = guestfs_set_e2uuid (g, device, uuid);
+    r = guestfs_grub_install (g, root, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/boot";
+    int r;
+    suppress_error = 0;
+    r = guestfs_is_dir (g, path);
     if (r == -1)
       return -1;
+    if (!r) {
+      fprintf (stderr, "test_grub_install_0: expected true, got false\n");
+      return -1;
+    }
   }
   return 0;
 }
 
-static int test_set_e2uuid_3 (void)
+static int test_zero_0 (void)
 {
-  /* InitBasicFS for set_e2uuid (3): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_zero_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1766,23 +1895,46 @@ static int test_set_e2uuid_3 (void)
     if (r == -1)
       return -1;
   }
-  /* TestRun for set_e2uuid (3) */
+  /* TestOutput for zero (0) */
+  char expected[] = "data";
+  {
+    char pathordevice[] = "/dev/sda1";
+    pathordevice[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount (g, pathordevice);
+    if (r == -1)
+      return -1;
+  }
   {
     char device[] = "/dev/sda1";
     device[5] = devchar;
-    char uuid[] = "time";
     int r;
     suppress_error = 0;
-    r = guestfs_set_e2uuid (g, device, uuid);
+    r = guestfs_zero (g, device);
     if (r == -1)
       return -1;
   }
+  {
+    char path[] = "/dev/sda1";
+    path[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_file (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_zero_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
   return 0;
 }
 
-static int test_set_e2label_0 (void)
+static int test_fsck_0 (void)
 {
-  /* InitBasicFS for set_e2label (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_fsck_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1840,38 +1992,36 @@ static int test_set_e2label_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for set_e2label (0) */
-  char expected[] = "testlabel";
+  /* TestOutputInt for fsck (0) */
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    char label[] = "testlabel";
+    char pathordevice[] = "/dev/sda1";
+    pathordevice[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_set_e2label (g, device, label);
+    r = guestfs_umount (g, pathordevice);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
     char device[] = "/dev/sda1";
     device[5] = devchar;
-    char *r;
+    int r;
     suppress_error = 0;
-    r = guestfs_get_e2label (g, device);
-    if (r == NULL)
+    r = guestfs_fsck (g, fstype, device);
+    if (r == -1)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_set_e2label_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (r != 0) {
+      fprintf (stderr, "test_fsck_0: expected 0 but got %d\n",               (int) r);
       return -1;
     }
-    free (r);
   }
   return 0;
 }
 
-static int test_pvremove_0 (void)
+static int test_fsck_1 (void)
 {
-  /* InitEmpty for pvremove (0) */
+  /* InitBasicFS for test_fsck_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1895,87 +2045,168 @@ static int test_pvremove_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for pvremove (0) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
-      NULL
-    };
-    int r;
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputInt for fsck (1) */
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char pathordevice[] = "/dev/sda1";
+    pathordevice[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_umount (g, pathordevice);
     if (r == -1)
       return -1;
   }
   {
-    char vgname[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, vgname);
+    r = guestfs_zero (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_fsck (g, fstype, device);
     if (r == -1)
       return -1;
+    if (r != 8) {
+      fprintf (stderr, "test_fsck_1: expected 8 but got %d\n",               (int) r);
+      return -1;
+    }
   }
+  return 0;
+}
+
+static int test_set_e2uuid_0 (void)
+{
+  /* InitBasicFS for test_set_e2uuid_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvremove (g, device);
+    r = guestfs_blockdev_setrw (g, device);
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    int r;
     suppress_error = 0;
-    r = guestfs_lvs (g);
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for set_e2uuid (0) */
+  char expected[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d";
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2uuid (g, device, uuid);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_get_e2uuid (g, device);
     if (r == NULL)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_pvremove_0: extra elements returned from command\n");
-      print_strings (r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_set_e2uuid_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_pvremove_1 (void)
+static int test_set_e2uuid_1 (void)
 {
-  /* InitEmpty for pvremove (1) */
+  /* InitBasicFS for test_set_e2uuid_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1999,191 +2230,2861 @@ static int test_pvremove_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for pvremove (1) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
-      NULL
-    };
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutput for set_e2uuid (1) */
+  char expected[] = "";
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "clear";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_set_e2uuid (g, device, uuid);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_get_e2uuid (g, device);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_set_e2uuid_1: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_set_e2uuid_2 (void)
+{
+  /* InitBasicFS for test_set_e2uuid_2: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_blockdev_setrw (g, device);
     if (r == -1)
       return -1;
   }
   {
-    char vgname[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, vgname);
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_pvremove (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
     suppress_error = 0;
-    r = guestfs_vgs (g);
-    if (r == NULL)
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_pvremove_1: extra elements returned from command\n");
-      print_strings (r);
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for set_e2uuid (2) */
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "random";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2uuid (g, device, uuid);
+    if (r == -1)
       return -1;
-    }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
-    free (r);
   }
   return 0;
 }
 
-static int test_pvremove_2 (void)
+static int test_set_e2uuid_3 (void)
 {
-  /* InitEmpty for pvremove (2) */
+  /* InitBasicFS for test_set_e2uuid_3: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for set_e2uuid (3) */
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "time";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2uuid (g, device, uuid);
+    if (r == -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_set_e2label_0 (void)
+{
+  /* InitBasicFS for test_set_e2label_0: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for set_e2label (0) */
+  char expected[] = "testlabel";
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char label[] = "testlabel";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2label (g, device, label);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_get_e2label (g, device);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_set_e2label_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_pvremove_0 (void)
+{
+  /* InitNone|InitEmpty for test_pvremove_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for pvremove (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char vgname[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgremove (g, vgname);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvremove (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_lvs (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_pvremove_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_pvremove_1 (void)
+{
+  /* InitNone|InitEmpty for test_pvremove_1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for pvremove (1) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char vgname[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgremove (g, vgname);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvremove (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_vgs (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_pvremove_1: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_pvremove_2 (void)
+{
+  /* InitNone|InitEmpty for test_pvremove_2 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for pvremove (2) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char vgname[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgremove (g, vgname);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvremove (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_pvs (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_pvremove_2: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_vgremove_0 (void)
+{
+  /* InitNone|InitEmpty for test_vgremove_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for vgremove (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char vgname[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgremove (g, vgname);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_lvs (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_vgremove_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_vgremove_1 (void)
+{
+  /* InitNone|InitEmpty for test_vgremove_1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for vgremove (1) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char vgname[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgremove (g, vgname);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_vgs (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_vgremove_1: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_lvremove_0 (void)
+{
+  /* InitNone|InitEmpty for test_lvremove_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for lvremove (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/VG/LV1";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvremove (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_lvs (g);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_lvremove_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "/dev/VG/LV2";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_lvremove_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_lvremove_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_lvremove_1 (void)
+{
+  /* InitNone|InitEmpty for test_lvremove_1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for lvremove (1) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvremove (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_lvs (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_lvremove_1: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_lvremove_2 (void)
+{
+  /* InitNone|InitEmpty for test_lvremove_2 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for lvremove (2) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
+    char *physvols[] = {
+      physvols_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_vgcreate (g, volgroup, physvols);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/VG";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvremove (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_vgs (g);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_lvremove_2: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "VG";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_lvremove_2: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_lvremove_2: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_mount_ro_0 (void)
+{
+  /* InitBasicFS for test_mount_ro_0: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestLastFail for mount_ro (0) */
+  {
+    char pathordevice[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount (g, pathordevice);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount_ro (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    int r;
+    suppress_error = 1;
+    r = guestfs_touch (g, path);
+    if (r != -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_mount_ro_1 (void)
+{
+  /* InitBasicFS for test_mount_ro_1: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for mount_ro (1) */
+  char expected[] = "data";
+  {
+    char path[] = "/new";
+    char content[] = "data";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char pathordevice[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount (g, pathordevice);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount_ro (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_mount_ro_1: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_tgz_in_0 (void)
+{
+  /* InitBasicFS for test_tgz_in_0: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for tgz_in (0) */
+  char expected[] = "hello\n";
+  {
+    char directory[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_tgz_in (g, "images/helloworld.tar.gz", directory);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/hello";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_tgz_in_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_tar_in_0 (void)
+{
+  /* InitBasicFS for test_tar_in_0: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for tar_in (0) */
+  char expected[] = "hello\n";
+  {
+    char directory[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_tar_in (g, "images/helloworld.tar", directory);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/hello";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_tar_in_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_0 (void)
+{
+  /* InitBasicFS for test_checksum_0: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for checksum (0) */
+  char expected[] = "935282863";
+  {
+    char path[] = "/new";
+    char content[] = "test\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "crc";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_1 (void)
+{
+  /* InitBasicFS for test_checksum_1: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestLastFail for checksum (1) */
+  {
+    char csumtype[] = "crc";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 1;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r != NULL)
+      return -1;
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_2 (void)
+{
+  /* InitBasicFS for test_checksum_2: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for checksum (2) */
+  char expected[] = "d8e8fca2dc0f896fd7cb4cb0031ba249";
+  {
+    char path[] = "/new";
+    char content[] = "test\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "md5";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_2: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_3 (void)
+{
+  /* InitBasicFS for test_checksum_3: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for checksum (3) */
+  char expected[] = "4e1243bd22c66e76c2ba9eddc1f91394e57f9f83";
+  {
+    char path[] = "/new";
+    char content[] = "test\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "sha1";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_3: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_4 (void)
+{
+  /* InitBasicFS for test_checksum_4: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for checksum (4) */
+  char expected[] = "52f1bf093f4b7588726035c176c0cdb4376cfea53819f1395ac9e6ec";
+  {
+    char path[] = "/new";
+    char content[] = "test\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "sha224";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_4: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_5 (void)
+{
+  /* InitBasicFS for test_checksum_5: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for checksum (5) */
+  char expected[] = "f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2";
+  {
+    char path[] = "/new";
+    char content[] = "test\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "sha256";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_5: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_6 (void)
+{
+  /* InitBasicFS for test_checksum_6: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for checksum (6) */
+  char expected[] = "109bb6b5b6d5547c1ce03c7a8bd7d8f80c1cb0957f50c4f7fda04692079917e4f9cad52b878f3d8234e1a170b154b72d";
+  {
+    char path[] = "/new";
+    char content[] = "test\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "sha384";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_6: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_checksum_7 (void)
+{
+  /* InitBasicFS for test_checksum_7: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for checksum (7) */
+  char expected[] = "0e3e75234abc68f4378a86b3f4b32a198ba301845b0cd6e50106e874345700cc6663a86c1ea125dc5e92be17c98f9a0f85ca9d5f595db2012f7cc3571945c123";
+  {
+    char path[] = "/new";
+    char content[] = "test\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "sha512";
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_7: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_download_0 (void)
+{
+  /* InitBasicFS for test_download_0: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for download (0) */
+  char expected[] = "e3eda01d9815f8d24aae2dbd89b68b06";
+  {
+    char remotefilename[] = "/COPYING.LIB";
+    int r;
+    suppress_error = 0;
+    r = guestfs_upload (g, "COPYING.LIB", remotefilename);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char remotefilename[] = "/COPYING.LIB";
+    int r;
+    suppress_error = 0;
+    r = guestfs_download (g, remotefilename, "testdownload.tmp");
+    if (r == -1)
+      return -1;
+  }
+  {
+    char remotefilename[] = "/upload";
+    int r;
+    suppress_error = 0;
+    r = guestfs_upload (g, "testdownload.tmp", remotefilename);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "md5";
+    char path[] = "/upload";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_download_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_upload_0 (void)
+{
+  /* InitBasicFS for test_upload_0: create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for upload (0) */
+  char expected[] = "e3eda01d9815f8d24aae2dbd89b68b06";
+  {
+    char remotefilename[] = "/COPYING.LIB";
+    int r;
+    suppress_error = 0;
+    r = guestfs_upload (g, "COPYING.LIB", remotefilename);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char csumtype[] = "md5";
+    char path[] = "/COPYING.LIB";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_checksum (g, csumtype, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_upload_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_blockdev_rereadpt_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_rereadpt_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for blockdev_rereadpt (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_rereadpt (g, device);
+    if (r == -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_blockdev_flushbufs_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_flushbufs_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for blockdev_flushbufs (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_flushbufs (g, device);
+    if (r == -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_blockdev_getsize64_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_getsize64_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputInt for blockdev_getsize64 (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int64_t r;
+    suppress_error = 0;
+    r = guestfs_blockdev_getsize64 (g, device);
+    if (r == -1)
+      return -1;
+    if (r != 524288000) {
+      fprintf (stderr, "test_blockdev_getsize64_0: expected 524288000 but got %d\n",               (int) r);
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_blockdev_getsz_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_getsz_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputInt for blockdev_getsz (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int64_t r;
+    suppress_error = 0;
+    r = guestfs_blockdev_getsz (g, device);
+    if (r == -1)
+      return -1;
+    if (r != 1024000) {
+      fprintf (stderr, "test_blockdev_getsz_0: expected 1024000 but got %d\n",               (int) r);
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_blockdev_getbsz_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_getbsz_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputInt for blockdev_getbsz (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_getbsz (g, device);
+    if (r == -1)
+      return -1;
+    if (r != 4096) {
+      fprintf (stderr, "test_blockdev_getbsz_0: expected 4096 but got %d\n",               (int) r);
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_blockdev_getss_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_getss_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputInt for blockdev_getss (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_getss (g, device);
+    if (r == -1)
+      return -1;
+    if (r != 512) {
+      fprintf (stderr, "test_blockdev_getss_0: expected 512 but got %d\n",               (int) r);
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_blockdev_getro_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_getro_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputTrue for blockdev_getro (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setro (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_getro (g, device);
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_blockdev_getro_0: expected true, got false\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_blockdev_setrw_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_setrw_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputFalse for blockdev_setrw (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_getro (g, device);
+    if (r == -1)
+      return -1;
+    if (r) {
+      fprintf (stderr, "test_blockdev_setrw_0: expected false, got true\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_blockdev_setro_0 (void)
+{
+  /* InitNone|InitEmpty for test_blockdev_setro_0 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
+  /* TestOutputTrue for blockdev_setro (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_blockdev_setro (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_blockdev_getro (g, device);
     if (r == -1)
       return -1;
+    if (!r) {
+      fprintf (stderr, "test_blockdev_setro_0: expected true, got false\n");
+      return -1;
+    }
   }
-  /* TestOutputList for pvremove (2) */
+  return 0;
+}
+
+static int test_statvfs_0 (void)
+{
+  /* InitBasicFS for test_statvfs_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
+    r = guestfs_blockdev_setrw (g, device);
     if (r == -1)
       return -1;
   }
   {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char vgname[] = "VG";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, vgname);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_pvremove (g, device);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputStruct for statvfs (0) */
   {
-    char **r;
-    int i;
+    char path[] = "/";
+    struct guestfs_statvfs *r;
     suppress_error = 0;
-    r = guestfs_pvs (g);
+    r = guestfs_statvfs (g, path);
     if (r == NULL)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_pvremove_2: extra elements returned from command\n");
-      print_strings (r);
+    if (r->bfree != 487702) {
+      fprintf (stderr, "test_statvfs_0: bfree was %d, expected 487702\n",
+               (int) r->bfree);
+      return -1;
+    }
+    if (r->blocks != 490020) {
+      fprintf (stderr, "test_statvfs_0: blocks was %d, expected 490020\n",
+               (int) r->blocks);
+      return -1;
+    }
+    if (r->bsize != 1024) {
+      fprintf (stderr, "test_statvfs_0: bsize was %d, expected 1024\n",
+               (int) r->bsize);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_vgremove_0 (void)
+static int test_lstat_0 (void)
 {
-  /* InitEmpty for vgremove (0) */
+  /* InitBasicFS for test_lstat_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2207,78 +5108,69 @@ static int test_vgremove_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for vgremove (0) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
-    int r;
-    suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
-    if (r == -1)
-      return -1;
-  }
-  {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputStruct for lstat (0) */
   {
-    char vgname[] = "VG";
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, vgname);
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    char path[] = "/new";
+    struct guestfs_stat *r;
     suppress_error = 0;
-    r = guestfs_lvs (g);
+    r = guestfs_lstat (g, path);
     if (r == NULL)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_vgremove_0: extra elements returned from command\n");
-      print_strings (r);
+    if (r->size != 0) {
+      fprintf (stderr, "test_lstat_0: size was %d, expected 0\n",
+               (int) r->size);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_vgremove_1 (void)
+static int test_stat_0 (void)
 {
-  /* InitEmpty for vgremove (1) */
+  /* InitBasicFS for test_stat_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2302,78 +5194,76 @@ static int test_vgremove_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for vgremove (1) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
-    int r;
-    suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
-    if (r == -1)
-      return -1;
-  }
-  {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputStruct for stat (0) */
   {
-    char vgname[] = "VG";
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, vgname);
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    char path[] = "/new";
+    struct guestfs_stat *r;
     suppress_error = 0;
-    r = guestfs_vgs (g);
+    r = guestfs_stat (g, path);
     if (r == NULL)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_vgremove_1: extra elements returned from command\n");
-      print_strings (r);
+    if (r->size != 0) {
+      fprintf (stderr, "test_stat_0: size was %d, expected 0\n",
+               (int) r->size);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_lvremove_0 (void)
+static int test_command_lines_0_prereq (void)
 {
-  /* InitEmpty for lvremove (0) */
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_0 (void)
+{
+  if (! test_command_lines_0_prereq ()) {
+  /* InitBasicFS for test_command_lines_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2397,77 +5287,85 @@ static int test_lvremove_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for lvremove (0) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
-      NULL
-    };
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for command_lines (0) */
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/VG/LV1";
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvremove (g, device);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "1";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_lvs (g);
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_lvremove_0: short list returned from command\n");
+      fprintf (stderr, "test_command_lines_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
     {
-      char expected[] = "/dev/VG/LV2";
+      char expected[] = "Result1";
       if (strcmp (r[0], expected) != 0) {
-        fprintf (stderr, "test_lvremove_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        fprintf (stderr, "test_command_lines_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
         return -1;
       }
     }
     if (r[1] != NULL) {
-      fprintf (stderr, "test_lvremove_0: extra elements returned from command\n");
+      fprintf (stderr, "test_command_lines_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -2475,12 +5373,21 @@ static int test_lvremove_0 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_0");
   return 0;
 }
 
-static int test_lvremove_1 (void)
+static int test_command_lines_1_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_1 (void)
 {
-  /* InitEmpty for lvremove (1) */
+  if (! test_command_lines_1_prereq ()) {
+  /* InitBasicFS for test_command_lines_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2504,65 +5411,85 @@ static int test_lvremove_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for lvremove (1) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
-      NULL
-    };
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for command_lines (1) */
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/VG";
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvremove (g, device);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "2";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_lvs (g);
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_lvremove_1: extra elements returned from command\n");
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result2";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_1: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_command_lines_1: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -2570,12 +5497,21 @@ static int test_lvremove_1 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_1");
   return 0;
 }
 
-static int test_lvremove_2 (void)
+static int test_command_lines_2_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_2 (void)
 {
-  /* InitEmpty for lvremove (2) */
+  if (! test_command_lines_2_prereq ()) {
+  /* InitBasicFS for test_command_lines_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2599,77 +5535,97 @@ static int test_lvremove_2 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for lvremove (2) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char volgroup[] = "VG";
-    char physvols_0[] = "/dev/sda";
-    physvols_0[5] = devchar;
-    char *physvols[] = {
-      physvols_0,
-      NULL
-    };
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, volgroup, physvols);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
-    char logvol[] = "LV1";
-    char volgroup[] = "VG";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for command_lines (2) */
   {
-    char logvol[] = "LV2";
-    char volgroup[] = "VG";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, logvol, volgroup, 50);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/VG";
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvremove (g, device);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "3";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_vgs (g);
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_lvremove_2: short list returned from command\n");
+      fprintf (stderr, "test_command_lines_2: short list returned from command\n");
       print_strings (r);
       return -1;
     }
     {
-      char expected[] = "VG";
+      char expected[] = "";
       if (strcmp (r[0], expected) != 0) {
-        fprintf (stderr, "test_lvremove_2: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        fprintf (stderr, "test_command_lines_2: expected \"%s\" but got \"%s\"\n", expected, r[0]);
         return -1;
       }
     }
-    if (r[1] != NULL) {
-      fprintf (stderr, "test_lvremove_2: extra elements returned from command\n");
+    if (!r[1]) {
+      fprintf (stderr, "test_command_lines_2: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result3";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_command_lines_2: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_command_lines_2: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -2677,12 +5633,21 @@ static int test_lvremove_2 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_2");
   return 0;
 }
 
-static int test_mount_ro_0 (void)
+static int test_command_lines_3_prereq (void)
 {
-  /* InitBasicFS for mount_ro (0): create ext2 on /dev/sda1 */
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_3 (void)
+{
+  if (! test_command_lines_3_prereq ()) {
+  /* InitBasicFS for test_command_lines_3: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2740,39 +5705,85 @@ static int test_mount_ro_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for mount_ro (0) */
+  /* TestOutputList for command_lines (3) */
   {
-    char pathordevice[] = "/";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, pathordevice);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    char mountpoint[] = "/";
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_mount_ro (g, device, mountpoint);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/new";
-    int r;
-    suppress_error = 1;
-    r = guestfs_touch (g, path);
-    if (r != -1)
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "4";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_command_lines (g, arguments);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_3: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_3: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_command_lines_3: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result4";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_command_lines_3: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_command_lines_3: extra elements returned from command\n");
+      print_strings (r);
       return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_3");
   return 0;
 }
 
-static int test_mount_ro_1 (void)
+static int test_command_lines_4_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_4 (void)
 {
-  /* InitBasicFS for mount_ro (1): create ext2 on /dev/sda1 */
+  if (! test_command_lines_4_prereq ()) {
+  /* InitBasicFS for test_command_lines_4: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2830,54 +5841,97 @@ static int test_mount_ro_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for mount_ro (1) */
-  char expected[] = "data";
-  {
-    char path[] = "/new";
-    char content[] = "data";
-    int r;
-    suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
-    if (r == -1)
-      return -1;
-  }
+  /* TestOutputList for command_lines (4) */
   {
-    char pathordevice[] = "/";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, pathordevice);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    char mountpoint[] = "/";
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_mount_ro (g, device, mountpoint);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/new";
-    char *r;
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "5";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_cat (g, path);
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_mount_ro_1: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_4: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_4: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_command_lines_4: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result5";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_command_lines_4: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_command_lines_4: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_command_lines_4: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
+    }
+    if (r[3] != NULL) {
+      fprintf (stderr, "test_command_lines_4: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_4");
   return 0;
 }
 
-static int test_tgz_in_0 (void)
+static int test_command_lines_5_prereq (void)
 {
-  /* InitBasicFS for tgz_in (0): create ext2 on /dev/sda1 */
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_5 (void)
+{
+  if (! test_command_lines_5_prereq ()) {
+  /* InitBasicFS for test_command_lines_5: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2935,35 +5989,109 @@ static int test_tgz_in_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for tgz_in (0) */
-  char expected[] = "hello\n";
+  /* TestOutputList for command_lines (5) */
   {
-    char directory[] = "/";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_tgz_in (g, "images/helloworld.tar.gz", directory);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/hello";
-    char *r;
+    char path[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_cat (g, path);
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "6";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_tgz_in_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_5: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_5: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_command_lines_5: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_command_lines_5: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_command_lines_5: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result6";
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_command_lines_5: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
+    }
+    if (!r[3]) {
+      fprintf (stderr, "test_command_lines_5: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[3], expected) != 0) {
+        fprintf (stderr, "test_command_lines_5: expected \"%s\" but got \"%s\"\n", expected, r[3]);
+        return -1;
+      }
+    }
+    if (r[4] != NULL) {
+      fprintf (stderr, "test_command_lines_5: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_5");
   return 0;
 }
 
-static int test_tar_in_0 (void)
+static int test_command_lines_6_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_6 (void)
 {
-  /* InitBasicFS for tar_in (0): create ext2 on /dev/sda1 */
+  if (! test_command_lines_6_prereq ()) {
+  /* InitBasicFS for test_command_lines_6: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3021,35 +6149,61 @@ static int test_tar_in_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for tar_in (0) */
-  char expected[] = "hello\n";
+  /* TestOutputList for command_lines (6) */
   {
-    char directory[] = "/";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_tar_in (g, "images/helloworld.tar", directory);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/hello";
-    char *r;
+    char path[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_cat (g, path);
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "7";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_tar_in_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_command_lines_6: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_6");
   return 0;
 }
 
-static int test_checksum_0 (void)
+static int test_command_lines_7_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_7 (void)
 {
-  /* InitBasicFS for checksum (0): create ext2 on /dev/sda1 */
+  if (! test_command_lines_7_prereq ()) {
+  /* InitBasicFS for test_command_lines_7: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3107,37 +6261,73 @@ static int test_checksum_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for checksum (0) */
-  char expected[] = "935282863";
+  /* TestOutputList for command_lines (7) */
   {
-    char path[] = "/new";
-    char content[] = "test\n";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "crc";
-    char path[] = "/new";
-    char *r;
+    char path[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "8";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_checksum_0: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_7: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_7: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_command_lines_7: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_7");
   return 0;
 }
 
-static int test_checksum_1 (void)
+static int test_command_lines_8_prereq (void)
 {
-  /* InitBasicFS for checksum (1): create ext2 on /dev/sda1 */
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_8 (void)
+{
+  if (! test_command_lines_8_prereq ()) {
+  /* InitBasicFS for test_command_lines_8: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3195,111 +6385,85 @@ static int test_checksum_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for checksum (1) */
-  {
-    char csumtype[] = "crc";
-    char path[] = "/new";
-    char *r;
-    suppress_error = 1;
-    r = guestfs_checksum (g, csumtype, path);
-    if (r != NULL)
-      return -1;
-    free (r);
-  }
-  return 0;
-}
-
-static int test_checksum_2 (void)
-{
-  /* InitBasicFS for checksum (2): create ext2 on /dev/sda1 */
-  {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    int r;
-    suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
-    if (r == -1)
-      return -1;
-  }
+  /* TestOutputList for command_lines (8) */
   {
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    char lines_0[] = ",";
-    char *lines[] = {
-      lines_0,
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "9";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
       NULL
     };
-    int r;
-    suppress_error = 0;
-    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
-    if (r == -1)
-      return -1;
-  }
-  {
-    char fstype[] = "ext2";
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    int r;
-    suppress_error = 0;
-    r = guestfs_mkfs (g, fstype, device);
-    if (r == -1)
-      return -1;
-  }
-  {
-    char device[] = "/dev/sda1";
-    device[5] = devchar;
-    char mountpoint[] = "/";
-    int r;
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_mount (g, device, mountpoint);
-    if (r == -1)
+    r = guestfs_command_lines (g, arguments);
+    if (r == NULL)
       return -1;
-  }
-  /* TestOutput for checksum (2) */
-  char expected[] = "d8e8fca2dc0f896fd7cb4cb0031ba249";
-  {
-    char path[] = "/new";
-    char content[] = "test\n";
-    int r;
-    suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
-    if (r == -1)
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_8: short list returned from command\n");
+      print_strings (r);
       return -1;
-  }
-  {
-    char csumtype[] = "md5";
-    char path[] = "/new";
-    char *r;
-    suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
-    if (r == NULL)
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_8: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_command_lines_8: short list returned from command\n");
+      print_strings (r);
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_checksum_2: expected \"%s\" but got \"%s\"\n", expected, r);
+    }
+    {
+      char expected[] = "";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_command_lines_8: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_command_lines_8: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_8");
   return 0;
 }
 
-static int test_checksum_3 (void)
+static int test_command_lines_9_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_9 (void)
 {
-  /* InitBasicFS for checksum (3): create ext2 on /dev/sda1 */
+  if (! test_command_lines_9_prereq ()) {
+  /* InitBasicFS for test_command_lines_9: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3357,37 +6521,85 @@ static int test_checksum_3 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for checksum (3) */
-  char expected[] = "4e1243bd22c66e76c2ba9eddc1f91394e57f9f83";
+  /* TestOutputList for command_lines (9) */
   {
-    char path[] = "/new";
-    char content[] = "test\n";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "sha1";
-    char path[] = "/new";
-    char *r;
+    char path[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "10";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_checksum_3: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_9: short list returned from command\n");
+      print_strings (r);
       return -1;
     }
+    {
+      char expected[] = "Result10-1";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_9: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_command_lines_9: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result10-2";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_command_lines_9: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_command_lines_9: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_9");
   return 0;
 }
 
-static int test_checksum_4 (void)
+static int test_command_lines_10_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_lines_10 (void)
 {
-  /* InitBasicFS for checksum (4): create ext2 on /dev/sda1 */
+  if (! test_command_lines_10_prereq ()) {
+  /* InitBasicFS for test_command_lines_10: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3445,37 +6657,85 @@ static int test_checksum_4 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for checksum (4) */
-  char expected[] = "52f1bf093f4b7588726035c176c0cdb4376cfea53819f1395ac9e6ec";
+  /* TestOutputList for command_lines (10) */
   {
-    char path[] = "/new";
-    char content[] = "test\n";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "sha224";
-    char path[] = "/new";
-    char *r;
+    char path[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "11";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_command_lines (g, arguments);
     if (r == NULL)
       return -1;
-    if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_checksum_4: expected \"%s\" but got \"%s\"\n", expected, r);
+    if (!r[0]) {
+      fprintf (stderr, "test_command_lines_10: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result11-1";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_command_lines_10: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_command_lines_10: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "Result11-2";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_command_lines_10: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_command_lines_10: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_10");
   return 0;
 }
 
-static int test_checksum_5 (void)
+static int test_command_0_prereq (void)
 {
-  /* InitBasicFS for checksum (5): create ext2 on /dev/sda1 */
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_0 (void)
+{
+  if (! test_command_0_prereq ()) {
+  /* InitBasicFS for test_command_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3533,37 +6793,58 @@ static int test_checksum_5 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for checksum (5) */
-  char expected[] = "f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2";
+  /* TestOutput for command (0) */
+  char expected[] = "Result1";
   {
-    char path[] = "/new";
-    char content[] = "test\n";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "sha256";
-    char path[] = "/new";
+    char path[] = "/test-command";
+    int r;
+    suppress_error = 0;
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "1";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_command (g, arguments);
     if (r == NULL)
       return -1;
     if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_checksum_5: expected \"%s\" but got \"%s\"\n", expected, r);
+      fprintf (stderr, "test_command_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_0");
   return 0;
 }
 
-static int test_checksum_6 (void)
+static int test_command_1_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_1 (void)
 {
-  /* InitBasicFS for checksum (6): create ext2 on /dev/sda1 */
+  if (! test_command_1_prereq ()) {
+  /* InitBasicFS for test_command_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3621,37 +6902,58 @@ static int test_checksum_6 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for checksum (6) */
-  char expected[] = "109bb6b5b6d5547c1ce03c7a8bd7d8f80c1cb0957f50c4f7fda04692079917e4f9cad52b878f3d8234e1a170b154b72d";
+  /* TestOutput for command (1) */
+  char expected[] = "Result2\n";
   {
-    char path[] = "/new";
-    char content[] = "test\n";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "sha384";
-    char path[] = "/new";
+    char path[] = "/test-command";
+    int r;
+    suppress_error = 0;
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "2";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_command (g, arguments);
     if (r == NULL)
       return -1;
     if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_checksum_6: expected \"%s\" but got \"%s\"\n", expected, r);
+      fprintf (stderr, "test_command_1: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_1");
   return 0;
 }
 
-static int test_checksum_7 (void)
+static int test_command_2_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_2 (void)
 {
-  /* InitBasicFS for checksum (7): create ext2 on /dev/sda1 */
+  if (! test_command_2_prereq ()) {
+  /* InitBasicFS for test_command_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3709,37 +7011,58 @@ static int test_checksum_7 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for checksum (7) */
-  char expected[] = "0e3e75234abc68f4378a86b3f4b32a198ba301845b0cd6e50106e874345700cc6663a86c1ea125dc5e92be17c98f9a0f85ca9d5f595db2012f7cc3571945c123";
+  /* TestOutput for command (2) */
+  char expected[] = "\nResult3";
   {
-    char path[] = "/new";
-    char content[] = "test\n";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, path, content, 0);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "sha512";
-    char path[] = "/new";
+    char path[] = "/test-command";
+    int r;
+    suppress_error = 0;
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "3";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_command (g, arguments);
     if (r == NULL)
       return -1;
     if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_checksum_7: expected \"%s\" but got \"%s\"\n", expected, r);
+      fprintf (stderr, "test_command_2: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_2");
   return 0;
 }
 
-static int test_download_0 (void)
+static int test_command_3_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_3 (void)
 {
-  /* InitBasicFS for download (0): create ext2 on /dev/sda1 */
+  if (! test_command_3_prereq ()) {
+  /* InitBasicFS for test_command_3: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3797,52 +7120,58 @@ static int test_download_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for download (0) */
-  char expected[] = "e3eda01d9815f8d24aae2dbd89b68b06";
-  {
-    char remotefilename[] = "/COPYING.LIB";
-    int r;
-    suppress_error = 0;
-    r = guestfs_upload (g, "COPYING.LIB", remotefilename);
-    if (r == -1)
-      return -1;
-  }
+  /* TestOutput for command (3) */
+  char expected[] = "\nResult4\n";
   {
-    char remotefilename[] = "/COPYING.LIB";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_download (g, remotefilename, "testdownload.tmp");
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char remotefilename[] = "/upload";
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_upload (g, "testdownload.tmp", remotefilename);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "md5";
-    char path[] = "/upload";
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "4";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_command (g, arguments);
     if (r == NULL)
       return -1;
     if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_download_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      fprintf (stderr, "test_command_3: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_3");
   return 0;
 }
 
-static int test_upload_0 (void)
+static int test_command_4_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_4 (void)
 {
-  /* InitBasicFS for upload (0): create ext2 on /dev/sda1 */
+  if (! test_command_4_prereq ()) {
+  /* InitBasicFS for test_command_4: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3900,36 +7229,58 @@ static int test_upload_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for upload (0) */
-  char expected[] = "e3eda01d9815f8d24aae2dbd89b68b06";
+  /* TestOutput for command (4) */
+  char expected[] = "\nResult5\n\n";
   {
-    char remotefilename[] = "/COPYING.LIB";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_upload (g, "COPYING.LIB", remotefilename);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char csumtype[] = "md5";
-    char path[] = "/COPYING.LIB";
+    char path[] = "/test-command";
+    int r;
+    suppress_error = 0;
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "5";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, csumtype, path);
+    r = guestfs_command (g, arguments);
     if (r == NULL)
       return -1;
     if (strcmp (r, expected) != 0) {
-      fprintf (stderr, "test_upload_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      fprintf (stderr, "test_command_4: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_4");
   return 0;
 }
 
-static int test_blockdev_rereadpt_0 (void)
+static int test_command_5_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_5 (void)
 {
-  /* InitEmpty for blockdev_rereadpt (0) */
+  if (! test_command_5_prereq ()) {
+  /* InitBasicFS for test_command_5: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3953,104 +7304,92 @@ static int test_blockdev_rereadpt_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestRun for blockdev_rereadpt (0) */
-  {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    int r;
-    suppress_error = 0;
-    r = guestfs_blockdev_rereadpt (g, device);
-    if (r == -1)
-      return -1;
-  }
-  return 0;
-}
-
-static int test_blockdev_flushbufs_0 (void)
-{
-  /* InitEmpty for blockdev_flushbufs (0) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_umount_all (g);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
-  /* TestRun for blockdev_flushbufs (0) */
   {
-    char device[] = "/dev/sda";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_flushbufs (g, device);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
-  return 0;
-}
-
-static int test_blockdev_getsize64_0 (void)
-{
-  /* InitEmpty for blockdev_getsize64 (0) */
   {
-    char device[] = "/dev/sda";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutput for command (5) */
+  char expected[] = "\n\nResult6\n\n";
   {
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
-  /* TestOutputInt for blockdev_getsize64 (0) */
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    int64_t r;
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "6";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char *r;
     suppress_error = 0;
-    r = guestfs_blockdev_getsize64 (g, device);
-    if (r == -1)
+    r = guestfs_command (g, arguments);
+    if (r == NULL)
       return -1;
-    if (r != 524288000) {
-      fprintf (stderr, "test_blockdev_getsize64_0: expected 524288000 but got %d\n",               (int) r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_command_5: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_5");
   return 0;
 }
 
-static int test_blockdev_getsz_0 (void)
+static int test_command_6_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_6 (void)
 {
-  /* InitEmpty for blockdev_getsz (0) */
+  if (! test_command_6_prereq ()) {
+  /* InitBasicFS for test_command_6: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4074,69 +7413,92 @@ static int test_blockdev_getsz_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputInt for blockdev_getsz (0) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
-    int64_t r;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getsz (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
-    if (r != 1024000) {
-      fprintf (stderr, "test_blockdev_getsz_0: expected 1024000 but got %d\n",               (int) r);
-      return -1;
-    }
   }
-  return 0;
-}
-
-static int test_blockdev_getbsz_0 (void)
-{
-  /* InitEmpty for blockdev_getbsz (0) */
   {
-    char device[] = "/dev/sda";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutput for command (6) */
+  char expected[] = "";
   {
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
-  /* TestOutputInt for blockdev_getbsz (0) */
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getbsz (g, device);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
-    if (r != 4096) {
-      fprintf (stderr, "test_blockdev_getbsz_0: expected 4096 but got %d\n",               (int) r);
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "7";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char *r;
+    suppress_error = 0;
+    r = guestfs_command (g, arguments);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_command_6: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_6");
   return 0;
 }
 
-static int test_blockdev_getss_0 (void)
+static int test_command_7_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_7 (void)
 {
-  /* InitEmpty for blockdev_getss (0) */
+  if (! test_command_7_prereq ()) {
+  /* InitBasicFS for test_command_7: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4160,78 +7522,92 @@ static int test_blockdev_getss_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputInt for blockdev_getss (0) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getss (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
-    if (r != 512) {
-      fprintf (stderr, "test_blockdev_getss_0: expected 512 but got %d\n",               (int) r);
-      return -1;
-    }
   }
-  return 0;
-}
-
-static int test_blockdev_getro_0 (void)
-{
-  /* InitEmpty for blockdev_getro (0) */
   {
-    char device[] = "/dev/sda";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutput for command (7) */
+  char expected[] = "\n";
   {
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for blockdev_getro (0) */
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setro (g, device);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    int r;
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "8";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char *r;
     suppress_error = 0;
-    r = guestfs_blockdev_getro (g, device);
-    if (r == -1)
+    r = guestfs_command (g, arguments);
+    if (r == NULL)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_blockdev_getro_0: expected true, got false\n");
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_command_7: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_7");
   return 0;
 }
 
-static int test_blockdev_setrw_0 (void)
+static int test_command_8_prereq (void)
 {
-  /* InitEmpty for blockdev_setrw (0) */
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_8 (void)
+{
+  if (! test_command_8_prereq ()) {
+  /* InitBasicFS for test_command_8: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4255,87 +7631,92 @@ static int test_blockdev_setrw_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputFalse for blockdev_setrw (0) */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda";
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getro (g, device);
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
-    if (r) {
-      fprintf (stderr, "test_blockdev_setrw_0: expected false, got true\n");
-      return -1;
-    }
   }
-  return 0;
-}
-
-static int test_blockdev_setro_0 (void)
-{
-  /* InitEmpty for blockdev_setro (0) */
   {
-    char device[] = "/dev/sda";
+    char device[] = "/dev/sda1";
     device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, device);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestOutput for command (8) */
+  char expected[] = "\n\n";
   {
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for blockdev_setro (0) */
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
+    char path[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setro (g, device);
+    r = guestfs_chmod (g, 493, path);
     if (r == -1)
       return -1;
   }
   {
-    char device[] = "/dev/sda";
-    device[5] = devchar;
-    int r;
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "9";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char *r;
     suppress_error = 0;
-    r = guestfs_blockdev_getro (g, device);
-    if (r == -1)
+    r = guestfs_command (g, arguments);
+    if (r == NULL)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_blockdev_setro_0: expected true, got false\n");
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_command_8: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
+    free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_8");
   return 0;
 }
 
-static int test_statvfs_0 (void)
+static int test_command_9_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_9 (void)
 {
-  /* InitBasicFS for statvfs (0): create ext2 on /dev/sda1 */
+  if (! test_command_9_prereq ()) {
+  /* InitBasicFS for test_command_9: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4393,37 +7774,58 @@ static int test_statvfs_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputStruct for statvfs (0) */
+  /* TestOutput for command (9) */
+  char expected[] = "Result10-1\nResult10-2\n";
   {
-    char path[] = "/";
-    struct guestfs_statvfs *r;
+    char remotefilename[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_statvfs (g, path);
-    if (r == NULL)
+    r = guestfs_upload (g, "test-command", remotefilename);
+    if (r == -1)
       return -1;
-    if (r->bfree != 487702) {
-      fprintf (stderr, "test_statvfs_0: bfree was %d, expected 487702\n",
-               (int) r->bfree);
+  }
+  {
+    char path[] = "/test-command";
+    int r;
+    suppress_error = 0;
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
       return -1;
-    }
-    if (r->blocks != 490020) {
-      fprintf (stderr, "test_statvfs_0: blocks was %d, expected 490020\n",
-               (int) r->blocks);
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "10";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char *r;
+    suppress_error = 0;
+    r = guestfs_command (g, arguments);
+    if (r == NULL)
       return -1;
-    }
-    if (r->bsize != 1024) {
-      fprintf (stderr, "test_statvfs_0: bsize was %d, expected 1024\n",
-               (int) r->bsize);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_command_9: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_9");
   return 0;
 }
 
-static int test_lstat_0 (void)
+static int test_command_10_prereq (void)
 {
-  /* InitBasicFS for lstat (0): create ext2 on /dev/sda1 */
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_10 (void)
+{
+  if (! test_command_10_prereq ()) {
+  /* InitBasicFS for test_command_10: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4481,35 +7883,58 @@ static int test_lstat_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputStruct for lstat (0) */
+  /* TestOutput for command (10) */
+  char expected[] = "Result11-1\nResult11-2";
   {
-    char path[] = "/new";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, path);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/new";
-    struct guestfs_stat *r;
+    char path[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_lstat (g, path);
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char arguments_1[] = "11";
+    char *arguments[] = {
+      arguments_0,
+      arguments_1,
+      NULL
+    };
+    char *r;
+    suppress_error = 0;
+    r = guestfs_command (g, arguments);
     if (r == NULL)
       return -1;
-    if (r->size != 0) {
-      fprintf (stderr, "test_lstat_0: size was %d, expected 0\n",
-               (int) r->size);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_command_10: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_10");
   return 0;
 }
 
-static int test_stat_0 (void)
+static int test_command_11_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_command_11 (void)
 {
-  /* InitBasicFS for stat (0): create ext2 on /dev/sda1 */
+  if (! test_command_11_prereq ()) {
+  /* InitBasicFS for test_command_11: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4567,35 +7992,44 @@ static int test_stat_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputStruct for stat (0) */
+  /* TestLastFail for command (11) */
   {
-    char path[] = "/new";
+    char remotefilename[] = "/test-command";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, path);
+    r = guestfs_upload (g, "test-command", remotefilename);
     if (r == -1)
       return -1;
   }
   {
-    char path[] = "/new";
-    struct guestfs_stat *r;
+    char path[] = "/test-command";
+    int r;
     suppress_error = 0;
-    r = guestfs_stat (g, path);
-    if (r == NULL)
+    r = guestfs_chmod (g, 493, path);
+    if (r == -1)
       return -1;
-    if (r->size != 0) {
-      fprintf (stderr, "test_stat_0: size was %d, expected 0\n",
-               (int) r->size);
+  }
+  {
+    char arguments_0[] = "/test-command";
+    char *arguments[] = {
+      arguments_0,
+      NULL
+    };
+    char *r;
+    suppress_error = 1;
+    r = guestfs_command (g, arguments);
+    if (r != NULL)
       return -1;
-    }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_11");
   return 0;
 }
 
 static int test_file_0 (void)
 {
-  /* InitBasicFS for file (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_file_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4681,7 +8115,7 @@ static int test_file_0 (void)
 
 static int test_file_1 (void)
 {
-  /* InitBasicFS for file (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_file_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4768,7 +8202,7 @@ static int test_file_1 (void)
 
 static int test_file_2 (void)
 {
-  /* InitBasicFS for file (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_file_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4841,7 +8275,7 @@ static int test_file_2 (void)
 
 static int test_umount_all_0 (void)
 {
-  /* InitBasicFS for umount_all (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_umount_all_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4928,7 +8362,7 @@ static int test_umount_all_0 (void)
 
 static int test_umount_all_1 (void)
 {
-  /* InitEmpty for umount_all (1) */
+  /* InitNone|InitEmpty for test_umount_all_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5083,7 +8517,7 @@ static int test_umount_all_1 (void)
 
 static int test_mounts_0 (void)
 {
-  /* InitBasicFS for mounts (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mounts_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5176,7 +8610,7 @@ static int test_mounts_0 (void)
 
 static int test_umount_0 (void)
 {
-  /* InitEmpty for umount (0) */
+  /* InitNone|InitEmpty for test_umount_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5269,7 +8703,7 @@ static int test_umount_0 (void)
 
 static int test_umount_1 (void)
 {
-  /* InitEmpty for umount (1) */
+  /* InitNone|InitEmpty for test_umount_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5357,7 +8791,7 @@ static int test_umount_1 (void)
 
 static int test_write_file_0 (void)
 {
-  /* InitBasicFS for write_file (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_write_file_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5444,7 +8878,7 @@ static int test_write_file_0 (void)
 
 static int test_write_file_1 (void)
 {
-  /* InitBasicFS for write_file (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_write_file_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5531,7 +8965,7 @@ static int test_write_file_1 (void)
 
 static int test_write_file_2 (void)
 {
-  /* InitBasicFS for write_file (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_write_file_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5618,7 +9052,7 @@ static int test_write_file_2 (void)
 
 static int test_write_file_3 (void)
 {
-  /* InitBasicFS for write_file (3): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_write_file_3: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5705,7 +9139,7 @@ static int test_write_file_3 (void)
 
 static int test_write_file_4 (void)
 {
-  /* InitBasicFS for write_file (4): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_write_file_4: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5792,7 +9226,7 @@ static int test_write_file_4 (void)
 
 static int test_write_file_5 (void)
 {
-  /* InitBasicFS for write_file (5): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_write_file_5: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5879,7 +9313,7 @@ static int test_write_file_5 (void)
 
 static int test_mkfs_0 (void)
 {
-  /* InitEmpty for mkfs (0) */
+  /* InitNone|InitEmpty for test_mkfs_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5966,7 +9400,7 @@ static int test_mkfs_0 (void)
 
 static int test_lvcreate_0 (void)
 {
-  /* InitEmpty for lvcreate (0) */
+  /* InitNone|InitEmpty for test_lvcreate_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6193,7 +9627,7 @@ static int test_lvcreate_0 (void)
 
 static int test_vgcreate_0 (void)
 {
-  /* InitEmpty for vgcreate (0) */
+  /* InitNone|InitEmpty for test_vgcreate_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6339,7 +9773,7 @@ static int test_vgcreate_0 (void)
 
 static int test_pvcreate_0 (void)
 {
-  /* InitEmpty for pvcreate (0) */
+  /* InitNone|InitEmpty for test_pvcreate_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6469,7 +9903,7 @@ static int test_pvcreate_0 (void)
 
 static int test_is_dir_0 (void)
 {
-  /* InitBasicFS for is_dir (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_is_dir_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6553,7 +9987,7 @@ static int test_is_dir_0 (void)
 
 static int test_is_dir_1 (void)
 {
-  /* InitBasicFS for is_dir (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_is_dir_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6637,7 +10071,7 @@ static int test_is_dir_1 (void)
 
 static int test_is_file_0 (void)
 {
-  /* InitBasicFS for is_file (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_is_file_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6721,7 +10155,7 @@ static int test_is_file_0 (void)
 
 static int test_is_file_1 (void)
 {
-  /* InitBasicFS for is_file (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_is_file_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6805,7 +10239,7 @@ static int test_is_file_1 (void)
 
 static int test_exists_0 (void)
 {
-  /* InitBasicFS for exists (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_exists_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6889,7 +10323,7 @@ static int test_exists_0 (void)
 
 static int test_exists_1 (void)
 {
-  /* InitBasicFS for exists (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_exists_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6973,7 +10407,7 @@ static int test_exists_1 (void)
 
 static int test_mkdir_p_0 (void)
 {
-  /* InitBasicFS for mkdir_p (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mkdir_p_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7057,7 +10491,7 @@ static int test_mkdir_p_0 (void)
 
 static int test_mkdir_p_1 (void)
 {
-  /* InitBasicFS for mkdir_p (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mkdir_p_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7141,7 +10575,7 @@ static int test_mkdir_p_1 (void)
 
 static int test_mkdir_p_2 (void)
 {
-  /* InitBasicFS for mkdir_p (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mkdir_p_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7225,7 +10659,7 @@ static int test_mkdir_p_2 (void)
 
 static int test_mkdir_0 (void)
 {
-  /* InitBasicFS for mkdir (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mkdir_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7309,7 +10743,7 @@ static int test_mkdir_0 (void)
 
 static int test_mkdir_1 (void)
 {
-  /* InitBasicFS for mkdir (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mkdir_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7381,7 +10815,7 @@ static int test_mkdir_1 (void)
 
 static int test_rm_rf_0 (void)
 {
-  /* InitBasicFS for rm_rf (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_rm_rf_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7489,7 +10923,7 @@ static int test_rm_rf_0 (void)
 
 static int test_rmdir_0 (void)
 {
-  /* InitBasicFS for rmdir (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_rmdir_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7569,7 +11003,7 @@ static int test_rmdir_0 (void)
 
 static int test_rmdir_1 (void)
 {
-  /* InitBasicFS for rmdir (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_rmdir_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7641,7 +11075,7 @@ static int test_rmdir_1 (void)
 
 static int test_rmdir_2 (void)
 {
-  /* InitBasicFS for rmdir (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_rmdir_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7721,7 +11155,7 @@ static int test_rmdir_2 (void)
 
 static int test_rm_0 (void)
 {
-  /* InitBasicFS for rm (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_rm_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7801,7 +11235,7 @@ static int test_rm_0 (void)
 
 static int test_rm_1 (void)
 {
-  /* InitBasicFS for rm (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_rm_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7873,7 +11307,7 @@ static int test_rm_1 (void)
 
 static int test_rm_2 (void)
 {
-  /* InitBasicFS for rm (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_rm_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7953,7 +11387,7 @@ static int test_rm_2 (void)
 
 static int test_read_lines_0 (void)
 {
-  /* InitBasicFS for read_lines (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_read_lines_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8079,7 +11513,7 @@ static int test_read_lines_0 (void)
 
 static int test_read_lines_1 (void)
 {
-  /* InitBasicFS for read_lines (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_read_lines_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8169,7 +11603,7 @@ static int test_read_lines_1 (void)
 
 static int test_lvs_0 (void)
 {
-  /* InitBasicFSonLVM for lvs (0): create ext2 on /dev/VG/LV */
+  /* InitBasicFSonLVM for test_lvs_0: create ext2 on /dev/VG/LV */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8291,7 +11725,7 @@ static int test_lvs_0 (void)
 
 static int test_lvs_1 (void)
 {
-  /* InitEmpty for lvs (1) */
+  /* InitNone|InitEmpty for test_lvs_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8476,7 +11910,7 @@ static int test_lvs_1 (void)
 
 static int test_vgs_0 (void)
 {
-  /* InitBasicFSonLVM for vgs (0): create ext2 on /dev/VG/LV */
+  /* InitBasicFSonLVM for test_vgs_0: create ext2 on /dev/VG/LV */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8598,7 +12032,7 @@ static int test_vgs_0 (void)
 
 static int test_vgs_1 (void)
 {
-  /* InitEmpty for vgs (1) */
+  /* InitNone|InitEmpty for test_vgs_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8744,7 +12178,7 @@ static int test_vgs_1 (void)
 
 static int test_pvs_0 (void)
 {
-  /* InitBasicFSonLVM for pvs (0): create ext2 on /dev/VG/LV */
+  /* InitBasicFSonLVM for test_pvs_0: create ext2 on /dev/VG/LV */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8867,7 +12301,7 @@ static int test_pvs_0 (void)
 
 static int test_pvs_1 (void)
 {
-  /* InitEmpty for pvs (1) */
+  /* InitNone|InitEmpty for test_pvs_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -8997,7 +12431,7 @@ static int test_pvs_1 (void)
 
 static int test_list_partitions_0 (void)
 {
-  /* InitBasicFS for list_partitions (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_list_partitions_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9090,7 +12524,7 @@ static int test_list_partitions_0 (void)
 
 static int test_list_partitions_1 (void)
 {
-  /* InitEmpty for list_partitions (1) */
+  /* InitNone|InitEmpty for test_list_partitions_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9193,7 +12627,7 @@ static int test_list_partitions_1 (void)
 
 static int test_list_devices_0 (void)
 {
-  /* InitEmpty for list_devices (0) */
+  /* InitNone|InitEmpty for test_list_devices_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9278,7 +12712,7 @@ static int test_list_devices_0 (void)
 
 static int test_ls_0 (void)
 {
-  /* InitBasicFS for ls (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_ls_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9431,7 +12865,7 @@ static int test_ls_0 (void)
 
 static int test_cat_0 (void)
 {
-  /* InitBasicFS for cat (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cat_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9518,7 +12952,7 @@ static int test_cat_0 (void)
 
 static int test_touch_0 (void)
 {
-  /* InitBasicFS for touch (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_touch_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9602,7 +13036,7 @@ static int test_touch_0 (void)
 
 static int test_sync_0 (void)
 {
-  /* InitEmpty for sync (0) */
+  /* InitNone|InitEmpty for test_sync_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9639,7 +13073,7 @@ static int test_sync_0 (void)
 
 static int test_mount_0 (void)
 {
-  /* InitEmpty for mount (0) */
+  /* InitNone|InitEmpty for test_mount_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -9864,9 +13298,51 @@ int main (int argc, char *argv[])
     free (devs[i]);
   free (devs);
 
-  nr_tests = 107;
+  nr_tests = 137;
 
   test_num++;
+  printf ("%3d/%3d test_lvresize_0\n", test_num, nr_tests);
+  if (test_lvresize_0 () == -1) {
+    printf ("test_lvresize_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_zerofree_0\n", test_num, nr_tests);
+  if (test_zerofree_0 () == -1) {
+    printf ("test_zerofree_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_hexdump_0\n", test_num, nr_tests);
+  if (test_hexdump_0 () == -1) {
+    printf ("test_hexdump_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_strings_e_0\n", test_num, nr_tests);
+  if (test_strings_e_0 () == -1) {
+    printf ("test_strings_e_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_strings_e_1\n", test_num, nr_tests);
+  if (test_strings_e_1 () == -1) {
+    printf ("test_strings_e_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_strings_0\n", test_num, nr_tests);
+  if (test_strings_0 () == -1) {
+    printf ("test_strings_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_strings_1\n", test_num, nr_tests);
+  if (test_strings_1 () == -1) {
+    printf ("test_strings_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
   printf ("%3d/%3d test_equal_0\n", test_num, nr_tests);
   if (test_equal_0 () == -1) {
     printf ("test_equal_0 FAILED\n");
@@ -10197,6 +13673,144 @@ int main (int argc, char *argv[])
     failed++;
   }
   test_num++;
+  printf ("%3d/%3d test_command_lines_0\n", test_num, nr_tests);
+  if (test_command_lines_0 () == -1) {
+    printf ("test_command_lines_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_1\n", test_num, nr_tests);
+  if (test_command_lines_1 () == -1) {
+    printf ("test_command_lines_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_2\n", test_num, nr_tests);
+  if (test_command_lines_2 () == -1) {
+    printf ("test_command_lines_2 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_3\n", test_num, nr_tests);
+  if (test_command_lines_3 () == -1) {
+    printf ("test_command_lines_3 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_4\n", test_num, nr_tests);
+  if (test_command_lines_4 () == -1) {
+    printf ("test_command_lines_4 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_5\n", test_num, nr_tests);
+  if (test_command_lines_5 () == -1) {
+    printf ("test_command_lines_5 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_6\n", test_num, nr_tests);
+  if (test_command_lines_6 () == -1) {
+    printf ("test_command_lines_6 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_7\n", test_num, nr_tests);
+  if (test_command_lines_7 () == -1) {
+    printf ("test_command_lines_7 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_8\n", test_num, nr_tests);
+  if (test_command_lines_8 () == -1) {
+    printf ("test_command_lines_8 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_9\n", test_num, nr_tests);
+  if (test_command_lines_9 () == -1) {
+    printf ("test_command_lines_9 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_lines_10\n", test_num, nr_tests);
+  if (test_command_lines_10 () == -1) {
+    printf ("test_command_lines_10 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_0\n", test_num, nr_tests);
+  if (test_command_0 () == -1) {
+    printf ("test_command_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_1\n", test_num, nr_tests);
+  if (test_command_1 () == -1) {
+    printf ("test_command_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_2\n", test_num, nr_tests);
+  if (test_command_2 () == -1) {
+    printf ("test_command_2 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_3\n", test_num, nr_tests);
+  if (test_command_3 () == -1) {
+    printf ("test_command_3 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_4\n", test_num, nr_tests);
+  if (test_command_4 () == -1) {
+    printf ("test_command_4 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_5\n", test_num, nr_tests);
+  if (test_command_5 () == -1) {
+    printf ("test_command_5 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_6\n", test_num, nr_tests);
+  if (test_command_6 () == -1) {
+    printf ("test_command_6 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_7\n", test_num, nr_tests);
+  if (test_command_7 () == -1) {
+    printf ("test_command_7 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_8\n", test_num, nr_tests);
+  if (test_command_8 () == -1) {
+    printf ("test_command_8 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_9\n", test_num, nr_tests);
+  if (test_command_9 () == -1) {
+    printf ("test_command_9 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_10\n", test_num, nr_tests);
+  if (test_command_10 () == -1) {
+    printf ("test_command_10 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_command_11\n", test_num, nr_tests);
+  if (test_command_11 () == -1) {
+    printf ("test_command_11 FAILED\n");
+    failed++;
+  }
+  test_num++;
   printf ("%3d/%3d test_file_0\n", test_num, nr_tests);
   if (test_file_0 () == -1) {
     printf ("test_file_0 FAILED\n");