X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tests.c;h=19a37757e8818b0e16bc16c380935c06fa7eec94;hp=31fa3bf2630a4966c200f434fca768294956aa8e;hb=1fc41b39dac877ccec1284da8bb14baa4df368b8;hpb=5cd39c83e23eb300d1bdfa806902a31b409ff420 diff --git a/tests.c b/tests.c index 31fa3bf..19a3775 100644 --- a/tests.c +++ b/tests.c @@ -121,10 +121,554 @@ static void no_test_warnings (void) 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 (void) { + /* 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"; { @@ -216,7 +760,7 @@ static int test_zerofree_0 (void) 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; @@ -303,7 +847,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; @@ -400,7 +944,7 @@ static int test_strings_e_1 (void) 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; @@ -514,7 +1058,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; @@ -603,7 +1147,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; @@ -698,7 +1242,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; @@ -793,7 +1337,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; @@ -866,7 +1410,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; @@ -903,7 +1447,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; @@ -941,7 +1485,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; @@ -978,7 +1522,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; @@ -1074,7 +1618,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; @@ -1168,7 +1712,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; @@ -1280,7 +1824,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; @@ -1376,7 +1920,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; @@ -1470,7 +2014,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; @@ -1574,7 +2118,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; @@ -1660,7 +2204,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; @@ -1757,7 +2301,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; @@ -1844,7 +2388,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; @@ -1940,7 +2484,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; @@ -2029,7 +2573,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; @@ -2118,7 +2662,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; @@ -2192,7 +2736,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; @@ -2266,7 +2810,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; @@ -2355,7 +2899,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; @@ -2459,7 +3003,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; @@ -2563,7 +3107,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; @@ -2667,7 +3211,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; @@ -2762,7 +3306,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; @@ -2857,7 +3401,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; @@ -2964,7 +3508,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; @@ -3059,7 +3603,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; @@ -3166,7 +3710,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; @@ -3256,7 +3800,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; @@ -3361,7 +3905,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; @@ -3447,7 +3991,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; @@ -3533,7 +4077,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; @@ -3621,7 +4165,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; @@ -3695,7 +4239,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; @@ -3783,7 +4327,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; @@ -3871,7 +4415,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; @@ -3959,7 +4503,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; @@ -4047,7 +4591,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; @@ -4135,7 +4679,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; @@ -4223,7 +4767,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; @@ -4326,7 +4870,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; @@ -4413,7 +4957,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; @@ -4452,7 +4996,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; @@ -4491,7 +5035,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; @@ -4534,7 +5078,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; @@ -4577,7 +5121,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; @@ -4620,7 +5164,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; @@ -4663,7 +5207,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; @@ -4715,7 +5259,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; @@ -4767,7 +5311,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; @@ -4819,7 +5363,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; @@ -4907,7 +5451,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; @@ -4993,7 +5537,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; @@ -5086,7 +5630,7 @@ static int test_command_lines_0_prereq (void) static int test_command_lines_0 (void) { if (! test_command_lines_0_prereq ()) { - /* InitBasicFS for command_lines (0): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -5210,7 +5754,7 @@ static int test_command_lines_1_prereq (void) static int test_command_lines_1 (void) { if (! test_command_lines_1_prereq ()) { - /* InitBasicFS for command_lines (1): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -5334,7 +5878,7 @@ static int test_command_lines_2_prereq (void) static int test_command_lines_2 (void) { if (! test_command_lines_2_prereq ()) { - /* InitBasicFS for command_lines (2): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -5470,7 +6014,7 @@ static int test_command_lines_3_prereq (void) static int test_command_lines_3 (void) { if (! test_command_lines_3_prereq ()) { - /* InitBasicFS for command_lines (3): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -5606,7 +6150,7 @@ static int test_command_lines_4_prereq (void) static int test_command_lines_4 (void) { if (! test_command_lines_4_prereq ()) { - /* InitBasicFS for command_lines (4): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_4: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -5754,7 +6298,7 @@ static int test_command_lines_5_prereq (void) static int test_command_lines_5 (void) { if (! test_command_lines_5_prereq ()) { - /* InitBasicFS for command_lines (5): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_5: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -5914,7 +6458,7 @@ static int test_command_lines_6_prereq (void) static int test_command_lines_6 (void) { if (! test_command_lines_6_prereq ()) { - /* InitBasicFS for command_lines (6): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_6: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6026,7 +6570,7 @@ static int test_command_lines_7_prereq (void) static int test_command_lines_7 (void) { if (! test_command_lines_7_prereq ()) { - /* InitBasicFS for command_lines (7): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_7: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6150,7 +6694,7 @@ static int test_command_lines_8_prereq (void) static int test_command_lines_8 (void) { if (! test_command_lines_8_prereq ()) { - /* InitBasicFS for command_lines (8): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_8: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6286,7 +6830,7 @@ static int test_command_lines_9_prereq (void) static int test_command_lines_9 (void) { if (! test_command_lines_9_prereq ()) { - /* InitBasicFS for command_lines (9): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_9: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6422,7 +6966,7 @@ static int test_command_lines_10_prereq (void) static int test_command_lines_10 (void) { if (! test_command_lines_10_prereq ()) { - /* InitBasicFS for command_lines (10): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_lines_10: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6558,7 +7102,7 @@ static int test_command_0_prereq (void) static int test_command_0 (void) { if (! test_command_0_prereq ()) { - /* InitBasicFS for command (0): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6667,7 +7211,7 @@ static int test_command_1_prereq (void) static int test_command_1 (void) { if (! test_command_1_prereq ()) { - /* InitBasicFS for command (1): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6776,7 +7320,7 @@ static int test_command_2_prereq (void) static int test_command_2 (void) { if (! test_command_2_prereq ()) { - /* InitBasicFS for command (2): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6885,7 +7429,7 @@ static int test_command_3_prereq (void) static int test_command_3 (void) { if (! test_command_3_prereq ()) { - /* InitBasicFS for command (3): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -6994,7 +7538,7 @@ static int test_command_4_prereq (void) static int test_command_4 (void) { if (! test_command_4_prereq ()) { - /* InitBasicFS for command (4): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_4: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7103,7 +7647,7 @@ static int test_command_5_prereq (void) static int test_command_5 (void) { if (! test_command_5_prereq ()) { - /* InitBasicFS for command (5): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_5: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7212,7 +7756,7 @@ static int test_command_6_prereq (void) static int test_command_6 (void) { if (! test_command_6_prereq ()) { - /* InitBasicFS for command (6): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_6: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7321,7 +7865,7 @@ static int test_command_7_prereq (void) static int test_command_7 (void) { if (! test_command_7_prereq ()) { - /* InitBasicFS for command (7): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_7: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7430,7 +7974,7 @@ static int test_command_8_prereq (void) static int test_command_8 (void) { if (! test_command_8_prereq ()) { - /* InitBasicFS for command (8): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_8: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7539,7 +8083,7 @@ static int test_command_9_prereq (void) static int test_command_9 (void) { if (! test_command_9_prereq ()) { - /* InitBasicFS for command (9): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_9: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7648,7 +8192,7 @@ static int test_command_10_prereq (void) static int test_command_10 (void) { if (! test_command_10_prereq ()) { - /* InitBasicFS for command (10): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_10: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7757,7 +8301,7 @@ static int test_command_11_prereq (void) static int test_command_11 (void) { if (! test_command_11_prereq ()) { - /* InitBasicFS for command (11): create ext2 on /dev/sda1 */ + /* InitBasicFS for test_command_11: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; device[5] = devchar; @@ -7852,7 +8396,7 @@ static int test_command_11 (void) 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; @@ -7938,7 +8482,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; @@ -8025,7 +8569,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; @@ -8098,7 +8642,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; @@ -8185,7 +8729,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; @@ -8340,7 +8884,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; @@ -8433,7 +8977,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; @@ -8526,7 +9070,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; @@ -8614,7 +9158,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; @@ -8701,7 +9245,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; @@ -8788,7 +9332,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; @@ -8875,7 +9419,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; @@ -8962,7 +9506,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; @@ -9049,7 +9593,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; @@ -9136,7 +9680,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; @@ -9223,7 +9767,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; @@ -9450,7 +9994,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; @@ -9596,7 +10140,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; @@ -9726,7 +10270,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; @@ -9810,7 +10354,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; @@ -9894,7 +10438,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; @@ -9978,7 +10522,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; @@ -10062,7 +10606,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; @@ -10146,7 +10690,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; @@ -10230,7 +10774,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; @@ -10314,7 +10858,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; @@ -10398,7 +10942,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; @@ -10482,7 +11026,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; @@ -10566,7 +11110,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; @@ -10638,7 +11182,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; @@ -10746,7 +11290,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; @@ -10826,7 +11370,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; @@ -10898,7 +11442,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; @@ -10978,7 +11522,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; @@ -11058,7 +11602,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; @@ -11130,7 +11674,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; @@ -11210,7 +11754,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; @@ -11336,7 +11880,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; @@ -11426,7 +11970,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; @@ -11548,7 +12092,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; @@ -11733,7 +12277,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; @@ -11855,7 +12399,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; @@ -12001,7 +12545,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; @@ -12124,7 +12668,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; @@ -12254,7 +12798,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; @@ -12347,7 +12891,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; @@ -12450,7 +12994,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; @@ -12535,7 +13079,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; @@ -12688,7 +13232,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; @@ -12775,7 +13319,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; @@ -12859,7 +13403,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; @@ -12896,7 +13440,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; @@ -13121,9 +13665,33 @@ int main (int argc, char *argv[]) free (devs[i]); free (devs); - nr_tests = 136; + 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");