X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tests.c;h=a4e7d476d03d98a61f9487e6bc581c359f1227e3;hp=000dbac8d19191cf9c0c386ee740a9fba4bf379a;hb=7b309445d4e9f93088ca052469338c8e3ce8dcbf;hpb=17fa7abbb83024deb639aebf27686848e232e085

diff --git a/tests.c b/tests.c
index 000dbac..a4e7d47 100644
--- a/tests.c
+++ b/tests.c
@@ -116,11 +116,660 @@ 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_find_0 (void)
+{
+  /* InitBasicFS for test_find_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;
+  }
+  /* TestOutputList for find (0) */
+  {
+    char directory[] = "/";
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_find (g, directory);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_find_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "lost+found";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_find_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_find_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_find_1 (void)
+{
+  /* InitBasicFS for test_find_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;
+  }
+  /* TestOutputList for find (1) */
+  {
+    char path[] = "/a";
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/b";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkdir (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/b/c";
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char directory[] = "/";
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_find (g, directory);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_find_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "a";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_find_1: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_find_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "b";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_find_1: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_find_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "b/c";
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_find_1: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
+    }
+    if (!r[3]) {
+      fprintf (stderr, "test_find_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "lost+found";
+      if (strcmp (r[3], expected) != 0) {
+        fprintf (stderr, "test_find_1: expected \"%s\" but got \"%s\"\n", expected, r[3]);
+        return -1;
+      }
+    }
+    if (r[4] != NULL) {
+      fprintf (stderr, "test_find_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_find_2 (void)
+{
+  /* InitBasicFS for test_find_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;
+  }
+  /* TestOutputList for find (2) */
+  {
+    char path[] = "/a/b/c";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkdir_p (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/a/b/c/d";
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char directory[] = "/a/b/";
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_find (g, directory);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_find_2: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "c";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_find_2: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_find_2: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "c/d";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_find_2: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_find_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_lvresize_0 (void)
+{
+  /* InitNone|InitEmpty for test_lvresize_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;
+  }
+  /* TestOutput for lvresize (0) */
+  char expected[] = "test content";
+  {
+    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 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/VG/LV";
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char content[] = "test content";
+    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/VG/LV";
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvresize (g, device, 20);
+    if (r == -1)
+      return -1;
+  }
+  {
+    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_zerofree_0_prereq (void)
+{
+  const char *str = getenv ("SKIP_ZEROFREE");
+  return str && strcmp (str, "1") == 0;
+}
+
+static int test_zerofree_0 (void)
+{
+  if (! test_zerofree_0_prereq ()) {
+  /* InitNone|InitEmpty for test_zerofree_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;
+  }
+  /* TestOutput for zerofree (0) */
+  char expected[] = "test file";
+  {
+    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[] = "ext3";
+    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;
+  }
+  {
+    char path[] = "/new";
+    char content[] = "test file";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    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;
+    int r;
+    suppress_error = 0;
+    r = guestfs_zerofree (g, 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;
+  }
+  {
+    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);
+  }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_zerofree_0");
+  return 0;
 }
 
 static int test_hexdump_0 (void)
 {
-  /* InitBasicFS for hexdump (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_hexdump_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -207,7 +856,7 @@ static int test_hexdump_0 (void)
 
 static int test_strings_e_0 (void)
 {
-  /* InitBasicFS for strings_e (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_strings_e_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -298,13 +947,13 @@ static int test_strings_e_0 (void)
 
 static int test_strings_e_1 (void)
 {
-  printf ("%s skipped (test disabled in generator)\n", "test_strings_e_1");
+  printf ("%s skipped (reason: test disabled in generator)\n", "test_strings_e_1");
   return 0;
 }
 
 static int test_strings_0 (void)
 {
-  /* InitBasicFS for strings (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_strings_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -418,7 +1067,7 @@ static int test_strings_0 (void)
 
 static int test_strings_1 (void)
 {
-  /* InitBasicFS for strings (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_strings_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -507,7 +1156,7 @@ static int test_strings_1 (void)
 
 static int test_equal_0 (void)
 {
-  /* InitBasicFS for equal (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_equal_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -602,7 +1251,7 @@ static int test_equal_0 (void)
 
 static int test_equal_1 (void)
 {
-  /* InitBasicFS for equal (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_equal_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -697,7 +1346,7 @@ static int test_equal_1 (void)
 
 static int test_equal_2 (void)
 {
-  /* InitBasicFS for equal (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_equal_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -770,7 +1419,7 @@ static int test_equal_2 (void)
 
 static int test_ping_daemon_0 (void)
 {
-  /* InitEmpty for ping_daemon (0) */
+  /* InitNone|InitEmpty for test_ping_daemon_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -807,7 +1456,7 @@ static int test_ping_daemon_0 (void)
 
 static int test_dmesg_0 (void)
 {
-  /* InitEmpty for dmesg (0) */
+  /* InitNone|InitEmpty for test_dmesg_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -845,7 +1494,7 @@ static int test_dmesg_0 (void)
 
 static int test_drop_caches_0 (void)
 {
-  /* InitEmpty for drop_caches (0) */
+  /* InitNone|InitEmpty for test_drop_caches_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -882,7 +1531,7 @@ static int test_drop_caches_0 (void)
 
 static int test_mv_0 (void)
 {
-  /* InitBasicFS for mv (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mv_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -978,7 +1627,7 @@ static int test_mv_0 (void)
 
 static int test_mv_1 (void)
 {
-  /* InitBasicFS for mv (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mv_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1072,7 +1721,7 @@ static int test_mv_1 (void)
 
 static int test_cp_a_0 (void)
 {
-  /* InitBasicFS for cp_a (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_a_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1184,7 +1833,7 @@ static int test_cp_a_0 (void)
 
 static int test_cp_0 (void)
 {
-  /* InitBasicFS for cp (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1280,7 +1929,7 @@ static int test_cp_0 (void)
 
 static int test_cp_1 (void)
 {
-  /* InitBasicFS for cp (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1374,7 +2023,7 @@ static int test_cp_1 (void)
 
 static int test_cp_2 (void)
 {
-  /* InitBasicFS for cp (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_cp_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1478,7 +2127,7 @@ static int test_cp_2 (void)
 
 static int test_grub_install_0 (void)
 {
-  /* InitBasicFS for grub_install (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_grub_install_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1564,7 +2213,7 @@ static int test_grub_install_0 (void)
 
 static int test_zero_0 (void)
 {
-  /* InitBasicFS for zero (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_zero_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1661,7 +2310,7 @@ static int test_zero_0 (void)
 
 static int test_fsck_0 (void)
 {
-  /* InitBasicFS for fsck (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_fsck_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1748,7 +2397,7 @@ static int test_fsck_0 (void)
 
 static int test_fsck_1 (void)
 {
-  /* InitBasicFS for fsck (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_fsck_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1844,7 +2493,7 @@ static int test_fsck_1 (void)
 
 static int test_set_e2uuid_0 (void)
 {
-  /* InitBasicFS for set_e2uuid (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_set_e2uuid_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -1933,7 +2582,7 @@ static int test_set_e2uuid_0 (void)
 
 static int test_set_e2uuid_1 (void)
 {
-  /* InitBasicFS for set_e2uuid (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_set_e2uuid_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2022,7 +2671,7 @@ static int test_set_e2uuid_1 (void)
 
 static int test_set_e2uuid_2 (void)
 {
-  /* InitBasicFS for set_e2uuid (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_set_e2uuid_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2096,7 +2745,7 @@ static int test_set_e2uuid_2 (void)
 
 static int test_set_e2uuid_3 (void)
 {
-  /* InitBasicFS for set_e2uuid (3): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_set_e2uuid_3: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2170,7 +2819,7 @@ static int test_set_e2uuid_3 (void)
 
 static int test_set_e2label_0 (void)
 {
-  /* InitBasicFS for set_e2label (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_set_e2label_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2259,7 +2908,7 @@ static int test_set_e2label_0 (void)
 
 static int test_pvremove_0 (void)
 {
-  /* InitEmpty for pvremove (0) */
+  /* InitNone|InitEmpty for test_pvremove_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2363,7 +3012,7 @@ static int test_pvremove_0 (void)
 
 static int test_pvremove_1 (void)
 {
-  /* InitEmpty for pvremove (1) */
+  /* InitNone|InitEmpty for test_pvremove_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2467,7 +3116,7 @@ static int test_pvremove_1 (void)
 
 static int test_pvremove_2 (void)
 {
-  /* InitEmpty for pvremove (2) */
+  /* InitNone|InitEmpty for test_pvremove_2 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2571,7 +3220,7 @@ static int test_pvremove_2 (void)
 
 static int test_vgremove_0 (void)
 {
-  /* InitEmpty for vgremove (0) */
+  /* InitNone|InitEmpty for test_vgremove_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2666,7 +3315,7 @@ static int test_vgremove_0 (void)
 
 static int test_vgremove_1 (void)
 {
-  /* InitEmpty for vgremove (1) */
+  /* InitNone|InitEmpty for test_vgremove_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2761,7 +3410,7 @@ static int test_vgremove_1 (void)
 
 static int test_lvremove_0 (void)
 {
-  /* InitEmpty for lvremove (0) */
+  /* InitNone|InitEmpty for test_lvremove_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2868,7 +3517,7 @@ static int test_lvremove_0 (void)
 
 static int test_lvremove_1 (void)
 {
-  /* InitEmpty for lvremove (1) */
+  /* InitNone|InitEmpty for test_lvremove_1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -2963,7 +3612,7 @@ static int test_lvremove_1 (void)
 
 static int test_lvremove_2 (void)
 {
-  /* InitEmpty for lvremove (2) */
+  /* InitNone|InitEmpty for test_lvremove_2 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3070,7 +3719,7 @@ static int test_lvremove_2 (void)
 
 static int test_mount_ro_0 (void)
 {
-  /* InitBasicFS for mount_ro (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mount_ro_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3160,7 +3809,7 @@ static int test_mount_ro_0 (void)
 
 static int test_mount_ro_1 (void)
 {
-  /* InitBasicFS for mount_ro (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_mount_ro_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3265,7 +3914,7 @@ static int test_mount_ro_1 (void)
 
 static int test_tgz_in_0 (void)
 {
-  /* InitBasicFS for tgz_in (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_tgz_in_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3351,7 +4000,7 @@ static int test_tgz_in_0 (void)
 
 static int test_tar_in_0 (void)
 {
-  /* InitBasicFS for tar_in (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_tar_in_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3437,7 +4086,7 @@ static int test_tar_in_0 (void)
 
 static int test_checksum_0 (void)
 {
-  /* InitBasicFS for checksum (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3525,7 +4174,7 @@ static int test_checksum_0 (void)
 
 static int test_checksum_1 (void)
 {
-  /* InitBasicFS for checksum (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3599,7 +4248,7 @@ static int test_checksum_1 (void)
 
 static int test_checksum_2 (void)
 {
-  /* InitBasicFS for checksum (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3687,7 +4336,7 @@ static int test_checksum_2 (void)
 
 static int test_checksum_3 (void)
 {
-  /* InitBasicFS for checksum (3): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_3: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3775,7 +4424,7 @@ static int test_checksum_3 (void)
 
 static int test_checksum_4 (void)
 {
-  /* InitBasicFS for checksum (4): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_4: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3863,7 +4512,7 @@ static int test_checksum_4 (void)
 
 static int test_checksum_5 (void)
 {
-  /* InitBasicFS for checksum (5): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_5: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -3951,7 +4600,7 @@ static int test_checksum_5 (void)
 
 static int test_checksum_6 (void)
 {
-  /* InitBasicFS for checksum (6): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_6: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4039,7 +4688,7 @@ static int test_checksum_6 (void)
 
 static int test_checksum_7 (void)
 {
-  /* InitBasicFS for checksum (7): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_checksum_7: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4127,7 +4776,7 @@ static int test_checksum_7 (void)
 
 static int test_download_0 (void)
 {
-  /* InitBasicFS for download (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_download_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4230,7 +4879,7 @@ static int test_download_0 (void)
 
 static int test_upload_0 (void)
 {
-  /* InitBasicFS for upload (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_upload_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4317,7 +4966,7 @@ static int test_upload_0 (void)
 
 static int test_blockdev_rereadpt_0 (void)
 {
-  /* InitEmpty for blockdev_rereadpt (0) */
+  /* InitNone|InitEmpty for test_blockdev_rereadpt_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4356,7 +5005,7 @@ static int test_blockdev_rereadpt_0 (void)
 
 static int test_blockdev_flushbufs_0 (void)
 {
-  /* InitEmpty for blockdev_flushbufs (0) */
+  /* InitNone|InitEmpty for test_blockdev_flushbufs_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4395,7 +5044,7 @@ static int test_blockdev_flushbufs_0 (void)
 
 static int test_blockdev_getsize64_0 (void)
 {
-  /* InitEmpty for blockdev_getsize64 (0) */
+  /* InitNone|InitEmpty for test_blockdev_getsize64_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4438,7 +5087,7 @@ static int test_blockdev_getsize64_0 (void)
 
 static int test_blockdev_getsz_0 (void)
 {
-  /* InitEmpty for blockdev_getsz (0) */
+  /* InitNone|InitEmpty for test_blockdev_getsz_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4481,7 +5130,7 @@ static int test_blockdev_getsz_0 (void)
 
 static int test_blockdev_getbsz_0 (void)
 {
-  /* InitEmpty for blockdev_getbsz (0) */
+  /* InitNone|InitEmpty for test_blockdev_getbsz_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4524,7 +5173,7 @@ static int test_blockdev_getbsz_0 (void)
 
 static int test_blockdev_getss_0 (void)
 {
-  /* InitEmpty for blockdev_getss (0) */
+  /* InitNone|InitEmpty for test_blockdev_getss_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4567,7 +5216,7 @@ static int test_blockdev_getss_0 (void)
 
 static int test_blockdev_getro_0 (void)
 {
-  /* InitEmpty for blockdev_getro (0) */
+  /* InitNone|InitEmpty for test_blockdev_getro_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4619,7 +5268,7 @@ static int test_blockdev_getro_0 (void)
 
 static int test_blockdev_setrw_0 (void)
 {
-  /* InitEmpty for blockdev_setrw (0) */
+  /* InitNone|InitEmpty for test_blockdev_setrw_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4671,7 +5320,7 @@ static int test_blockdev_setrw_0 (void)
 
 static int test_blockdev_setro_0 (void)
 {
-  /* InitEmpty for blockdev_setro (0) */
+  /* InitNone|InitEmpty for test_blockdev_setro_0 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4723,7 +5372,7 @@ static int test_blockdev_setro_0 (void)
 
 static int test_statvfs_0 (void)
 {
-  /* InitBasicFS for statvfs (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_statvfs_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4811,7 +5460,7 @@ static int test_statvfs_0 (void)
 
 static int test_lstat_0 (void)
 {
-  /* InitBasicFS for lstat (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_lstat_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4897,7 +5546,7 @@ static int test_lstat_0 (void)
 
 static int test_stat_0 (void)
 {
-  /* InitBasicFS for stat (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for test_stat_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -4981,9 +5630,16 @@ static int test_stat_0 (void)
   return 0;
 }
 
+static int test_command_lines_0_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
 static int test_command_lines_0 (void)
 {
-  /* InitBasicFS for command_lines (0): create ext2 on /dev/sda1 */
+  if (! test_command_lines_0_prereq ()) {
+  /* InitBasicFS for test_command_lines_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5093,12 +5749,21 @@ static int test_command_lines_0 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_0");
   return 0;
 }
 
+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)
 {
-  /* InitBasicFS for command_lines (1): create ext2 on /dev/sda1 */
+  if (! test_command_lines_1_prereq ()) {
+  /* InitBasicFS for test_command_lines_1: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5208,12 +5873,21 @@ static int test_command_lines_1 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_1");
   return 0;
 }
 
+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)
 {
-  /* InitBasicFS for command_lines (2): create ext2 on /dev/sda1 */
+  if (! test_command_lines_2_prereq ()) {
+  /* InitBasicFS for test_command_lines_2: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5335,12 +6009,21 @@ static int test_command_lines_2 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_2");
   return 0;
 }
 
+static int test_command_lines_3_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
 static int test_command_lines_3 (void)
 {
-  /* InitBasicFS for command_lines (3): create ext2 on /dev/sda1 */
+  if (! test_command_lines_3_prereq ()) {
+  /* InitBasicFS for test_command_lines_3: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5462,12 +6145,21 @@ static int test_command_lines_3 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_3");
   return 0;
 }
 
+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 command_lines (4): 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;
@@ -5601,12 +6293,21 @@ static int test_command_lines_4 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_4");
   return 0;
 }
 
+static int test_command_lines_5_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
 static int test_command_lines_5 (void)
 {
-  /* InitBasicFS for command_lines (5): create ext2 on /dev/sda1 */
+  if (! test_command_lines_5_prereq ()) {
+  /* InitBasicFS for test_command_lines_5: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -5752,12 +6453,21 @@ static int test_command_lines_5 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_5");
   return 0;
 }
 
+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 command_lines (6): 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;
@@ -5855,12 +6565,21 @@ static int test_command_lines_6 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_6");
   return 0;
 }
 
+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 command_lines (7): 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;
@@ -5970,12 +6689,21 @@ static int test_command_lines_7 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_7");
   return 0;
 }
 
+static int test_command_lines_8_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
 static int test_command_lines_8 (void)
 {
-  /* InitBasicFS for command_lines (8): create ext2 on /dev/sda1 */
+  if (! test_command_lines_8_prereq ()) {
+  /* InitBasicFS for test_command_lines_8: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6097,12 +6825,21 @@ static int test_command_lines_8 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_8");
   return 0;
 }
 
+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 command_lines (9): 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;
@@ -6224,12 +6961,21 @@ static int test_command_lines_9 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_9");
   return 0;
 }
 
+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 command_lines (10): 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;
@@ -6351,12 +7097,21 @@ static int test_command_lines_10 (void)
       free (r[i]);
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_lines_10");
   return 0;
 }
 
+static int test_command_0_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
 static int test_command_0 (void)
 {
-  /* InitBasicFS for command (0): create ext2 on /dev/sda1 */
+  if (! test_command_0_prereq ()) {
+  /* InitBasicFS for test_command_0: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6451,12 +7206,21 @@ static int test_command_0 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_0");
   return 0;
 }
 
+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 command (1): 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;
@@ -6551,12 +7315,21 @@ static int test_command_1 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_1");
   return 0;
 }
 
+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 command (2): 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;
@@ -6651,12 +7424,21 @@ static int test_command_2 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_2");
   return 0;
 }
 
+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 command (3): 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;
@@ -6751,12 +7533,21 @@ static int test_command_3 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_3");
   return 0;
 }
 
+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 command (4): 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;
@@ -6851,12 +7642,21 @@ static int test_command_4 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_4");
   return 0;
 }
 
+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)
 {
-  /* InitBasicFS for command (5): create ext2 on /dev/sda1 */
+  if (! test_command_5_prereq ()) {
+  /* InitBasicFS for test_command_5: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -6951,12 +7751,21 @@ static int test_command_5 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_5");
   return 0;
 }
 
+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)
 {
-  /* InitBasicFS for command (6): create ext2 on /dev/sda1 */
+  if (! test_command_6_prereq ()) {
+  /* InitBasicFS for test_command_6: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7051,12 +7860,21 @@ static int test_command_6 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_6");
   return 0;
 }
 
+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)
 {
-  /* InitBasicFS for command (7): create ext2 on /dev/sda1 */
+  if (! test_command_7_prereq ()) {
+  /* InitBasicFS for test_command_7: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7151,12 +7969,21 @@ static int test_command_7 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_7");
   return 0;
 }
 
+static int test_command_8_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
 static int test_command_8 (void)
 {
-  /* InitBasicFS for command (8): create ext2 on /dev/sda1 */
+  if (! test_command_8_prereq ()) {
+  /* InitBasicFS for test_command_8: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7251,12 +8078,21 @@ static int test_command_8 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_8");
   return 0;
 }
 
+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 command (9): 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;
@@ -7351,12 +8187,21 @@ static int test_command_9 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_9");
   return 0;
 }
 
+static int test_command_10_prereq (void)
+{
+  const char *str = getenv ("SKIP_TEST_COMMAND");
+  return str && strcmp (str, "1") == 0;
+}
+
 static int test_command_10 (void)
 {
-  /* InitBasicFS for command (10): create ext2 on /dev/sda1 */
+  if (! test_command_10_prereq ()) {
+  /* InitBasicFS for test_command_10: create ext2 on /dev/sda1 */
   {
     char device[] = "/dev/sda";
     device[5] = devchar;
@@ -7451,12 +8296,21 @@ static int test_command_10 (void)
     }
     free (r);
   }
+  } else
+    printf ("%s skipped (reason: test prerequisite)\n", "test_command_10");
   return 0;
 }
 
+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 command (11): 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;
@@ -7544,12 +8398,14 @@ static int test_command_11 (void)
       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;
@@ -7635,7 +8491,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;
@@ -7722,7 +8578,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;
@@ -7795,7 +8651,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;
@@ -7882,7 +8738,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;
@@ -8037,7 +8893,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;
@@ -8130,7 +8986,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;
@@ -8223,7 +9079,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;
@@ -8311,7 +9167,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;
@@ -8398,7 +9254,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;
@@ -8485,7 +9341,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;
@@ -8572,7 +9428,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;
@@ -8659,7 +9515,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;
@@ -8746,7 +9602,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;
@@ -8833,7 +9689,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;
@@ -8920,7 +9776,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;
@@ -9147,7 +10003,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;
@@ -9293,7 +10149,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;
@@ -9423,7 +10279,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;
@@ -9507,7 +10363,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;
@@ -9591,7 +10447,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;
@@ -9675,7 +10531,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;
@@ -9759,7 +10615,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;
@@ -9843,7 +10699,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;
@@ -9927,7 +10783,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;
@@ -10011,7 +10867,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;
@@ -10095,7 +10951,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;
@@ -10179,7 +11035,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;
@@ -10263,7 +11119,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;
@@ -10335,7 +11191,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;
@@ -10443,7 +11299,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;
@@ -10523,7 +11379,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;
@@ -10595,7 +11451,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;
@@ -10675,7 +11531,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;
@@ -10755,7 +11611,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;
@@ -10827,7 +11683,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;
@@ -10907,7 +11763,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;
@@ -11033,7 +11889,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;
@@ -11123,7 +11979,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;
@@ -11245,7 +12101,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;
@@ -11430,7 +12286,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;
@@ -11552,7 +12408,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;
@@ -11698,7 +12554,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;
@@ -11821,7 +12677,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;
@@ -11951,7 +12807,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;
@@ -12044,7 +12900,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;
@@ -12147,7 +13003,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;
@@ -12232,7 +13088,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;
@@ -12385,7 +13241,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;
@@ -12472,7 +13328,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;
@@ -12556,7 +13412,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;
@@ -12593,7 +13449,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;
@@ -12818,9 +13674,39 @@ int main (int argc, char *argv[])
     free (devs[i]);
   free (devs);
 
-  nr_tests = 135;
+  nr_tests = 140;
 
   test_num++;
+  printf ("%3d/%3d test_find_0\n", test_num, nr_tests);
+  if (test_find_0 () == -1) {
+    printf ("test_find_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_find_1\n", test_num, nr_tests);
+  if (test_find_1 () == -1) {
+    printf ("test_find_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_find_2\n", test_num, nr_tests);
+  if (test_find_2 () == -1) {
+    printf ("test_find_2 FAILED\n");
+    failed++;
+  }
+  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");