X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=capitests%2Ftests.c;h=62d4805f61ea0251d99d4c1d42cd2c7913628487;hp=d2638629da4ca876d936707f102f319e5b81702a;hb=bcb3fc0c3336c05e9ecbbfb25c7c31b42bd3e32e;hpb=b6adf09c4d2cc3f1d0285950c151b1fd7688ec67 diff --git a/capitests/tests.c b/capitests/tests.c index d263862..62d4805 100644 --- a/capitests/tests.c +++ b/capitests/tests.c @@ -31,128 +31,829 @@ static guestfs_h *g; static int suppress_error = 0; -/* This will be 's' or 'h' depending on whether the guest kernel - * names IDE devices /dev/sd* or /dev/hd*. - */ -static char devchar = 's'; +static void print_error (guestfs_h *g, void *data, const char *msg) +{ + if (!suppress_error) + fprintf (stderr, "%s\n", msg); +} + +static void print_strings (char * const * const argv) +{ + int argc; + + for (argc = 0; argv[argc] != NULL; ++argc) + printf ("\t%s\n", argv[argc]); +} + +/* +static void print_table (char * const * const argv) +{ + int i; + + for (i = 0; argv[i] != NULL; i += 2) + printf ("%s: %s\n", argv[i], argv[i+1]); +} +*/ + +static void no_test_warnings (void) +{ + fprintf (stderr, "warning: \"guestfs_test0\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rint\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rinterr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rint64\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rint64err\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rbool\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rboolerr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rconststring\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rconststringerr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstring\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstringerr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstringlist\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstringlisterr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rintbool\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rintboolerr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rpvlist\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rpvlisterr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rvglist\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rvglisterr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rlvlist\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rlvlisterr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstat\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstaterr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstatvfs\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rstatvfserr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rhashtable\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_test0rhashtableerr\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_launch\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_wait_ready\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_kill_subprocess\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_add_drive\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_add_cdrom\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_add_drive_ro\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_config\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_set_qemu\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_get_qemu\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_set_path\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_get_path\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_set_append\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_get_append\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_set_autosync\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_get_autosync\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_set_verbose\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_get_verbose\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_is_ready\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_is_config\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_is_launching\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_is_busy\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_get_state\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_set_busy\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_set_ready\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_end_busy\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_ll\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_pvs_full\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_vgs_full\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_lvs_full\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_init\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_close\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_defvar\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_defnode\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_get\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_set\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_insert\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_rm\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_mv\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_match\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_save\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_load\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_aug_ls\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_chmod\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_chown\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_sfdisk\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_lvm_remove_all\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_tune2fs_l\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_blockdev_setbsz\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_tar_out\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_tgz_out\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_mount_options\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_mount_vfs\" has no tests\n"); + 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"); + fprintf (stderr, "warning: \"guestfs_e2fsck_f\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_sh\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_sh_lines\" has no tests\n"); + fprintf (stderr, "warning: \"guestfs_scrub_freespace\" has no tests\n"); +} + +static int test_scrub_file_0_skip (void) +{ + const char *str; + + str = getenv ("SKIP_TEST_SCRUB_FILE_0"); + if (str && strcmp (str, "1") == 0) return 1; + str = getenv ("SKIP_TEST_SCRUB_FILE"); + if (str && strcmp (str, "1") == 0) return 1; + return 0; +} + +static int test_scrub_file_0 (void) +{ + if (test_scrub_file_0_skip ()) { + printf ("%s skipped (reason: SKIP_TEST_* variable set)\n", "test_scrub_file_0"); + return 0; + } + + /* InitBasicFS for test_scrub_file_0: create ext2 on /dev/sda1 */ + { + char device[] = "/dev/sda"; + 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"; + 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"; + int r; + suppress_error = 0; + r = guestfs_mkfs (g, fstype, device); + if (r == -1) + return -1; + } + { + char device[] = "/dev/sda1"; + char mountpoint[] = "/"; + int r; + suppress_error = 0; + r = guestfs_mount (g, device, mountpoint); + if (r == -1) + return -1; + } + /* TestRun for scrub_file (0) */ + { + char path[] = "/file"; + char content[] = "content"; + int r; + suppress_error = 0; + r = guestfs_write_file (g, path, content, 0); + if (r == -1) + return -1; + } + { + char file[] = "/file"; + int r; + suppress_error = 0; + r = guestfs_scrub_file (g, file); + if (r == -1) + return -1; + } + return 0; +} + +static int test_scrub_device_0_skip (void) +{ + const char *str; + + str = getenv ("SKIP_TEST_SCRUB_DEVICE_0"); + if (str && strcmp (str, "1") == 0) return 1; + str = getenv ("SKIP_TEST_SCRUB_DEVICE"); + if (str && strcmp (str, "1") == 0) return 1; + return 0; +} + +static int test_scrub_device_0 (void) +{ + if (test_scrub_device_0_skip ()) { + printf ("%s skipped (reason: SKIP_TEST_* variable set)\n", "test_scrub_device_0"); + return 0; + } + + /* InitNone|InitEmpty for test_scrub_device_0 */ + { + char device[] = "/dev/sda"; + int r; + suppress_error = 0; + r = guestfs_blockdev_setrw (g, device); + if (r == -1) + return -1; + } + { + int r; + suppress_error = 0; + r = guestfs_umount_all (g); + if (r == -1) + return -1; + } + { + int r; + suppress_error = 0; + r = guestfs_lvm_remove_all (g); + if (r == -1) + return -1; + } + /* TestRun for scrub_device (0) */ + { + char device[] = "/dev/sdc"; + int r; + suppress_error = 0; + r = guestfs_scrub_device (g, device); + if (r == -1) + return -1; + } + return 0; +} + +static int test_glob_expand_0_skip (void) +{ + const char *str; + + str = getenv ("SKIP_TEST_GLOB_EXPAND_0"); + if (str && strcmp (str, "1") == 0) return 1; + str = getenv ("SKIP_TEST_GLOB_EXPAND"); + if (str && strcmp (str, "1") == 0) return 1; + return 0; +} + +static int test_glob_expand_0 (void) +{ + if (test_glob_expand_0_skip ()) { + printf ("%s skipped (reason: SKIP_TEST_* variable set)\n", "test_glob_expand_0"); + return 0; + } + + /* InitBasicFS for test_glob_expand_0: create ext2 on /dev/sda1 */ + { + char device[] = "/dev/sda"; + 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"; + 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"; + int r; + suppress_error = 0; + r = guestfs_mkfs (g, fstype, device); + if (r == -1) + return -1; + } + { + char device[] = "/dev/sda1"; + char mountpoint[] = "/"; + int r; + suppress_error = 0; + r = guestfs_mount (g, device, mountpoint); + if (r == -1) + return -1; + } + /* TestOutputList for glob_expand (0) */ + { + 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 path[] = "/a/b/c/e"; + int r; + suppress_error = 0; + r = guestfs_touch (g, path); + if (r == -1) + return -1; + } + { + char pattern[] = "/a/b/c/*"; + char **r; + int i; + suppress_error = 0; + r = guestfs_glob_expand (g, pattern); + if (r == NULL) + return -1; + if (!r[0]) { + fprintf (stderr, "test_glob_expand_0: short list returned from command\n"); + print_strings (r); + return -1; + } + { + char expected[] = "/a/b/c/d"; + if (strcmp (r[0], expected) != 0) { + fprintf (stderr, "test_glob_expand_0: expected \"%s\" but got \"%s\"\n", expected, r[0]); + return -1; + } + } + if (!r[1]) { + fprintf (stderr, "test_glob_expand_0: short list returned from command\n"); + print_strings (r); + return -1; + } + { + char expected[] = "/a/b/c/e"; + if (strcmp (r[1], expected) != 0) { + fprintf (stderr, "test_glob_expand_0: expected \"%s\" but got \"%s\"\n", expected, r[1]); + return -1; + } + } + if (r[2] != NULL) { + fprintf (stderr, "test_glob_expand_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_glob_expand_1_skip (void) +{ + const char *str; + + str = getenv ("SKIP_TEST_GLOB_EXPAND_1"); + if (str && strcmp (str, "1") == 0) return 1; + str = getenv ("SKIP_TEST_GLOB_EXPAND"); + if (str && strcmp (str, "1") == 0) return 1; + return 0; +} + +static int test_glob_expand_1 (void) +{ + if (test_glob_expand_1_skip ()) { + printf ("%s skipped (reason: SKIP_TEST_* variable set)\n", "test_glob_expand_1"); + return 0; + } + + /* InitBasicFS for test_glob_expand_1: create ext2 on /dev/sda1 */ + { + char device[] = "/dev/sda"; + 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"; + 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"; + int r; + suppress_error = 0; + r = guestfs_mkfs (g, fstype, device); + if (r == -1) + return -1; + } + { + char device[] = "/dev/sda1"; + char mountpoint[] = "/"; + int r; + suppress_error = 0; + r = guestfs_mount (g, device, mountpoint); + if (r == -1) + return -1; + } + /* TestOutputList for glob_expand (1) */ + { + 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 path[] = "/a/b/c/e"; + int r; + suppress_error = 0; + r = guestfs_touch (g, path); + if (r == -1) + return -1; + } + { + char pattern[] = "/a/*/c/*"; + char **r; + int i; + suppress_error = 0; + r = guestfs_glob_expand (g, pattern); + if (r == NULL) + return -1; + if (!r[0]) { + fprintf (stderr, "test_glob_expand_1: short list returned from command\n"); + print_strings (r); + return -1; + } + { + char expected[] = "/a/b/c/d"; + if (strcmp (r[0], expected) != 0) { + fprintf (stderr, "test_glob_expand_1: expected \"%s\" but got \"%s\"\n", expected, r[0]); + return -1; + } + } + if (!r[1]) { + fprintf (stderr, "test_glob_expand_1: short list returned from command\n"); + print_strings (r); + return -1; + } + { + char expected[] = "/a/b/c/e"; + if (strcmp (r[1], expected) != 0) { + fprintf (stderr, "test_glob_expand_1: expected \"%s\" but got \"%s\"\n", expected, r[1]); + return -1; + } + } + if (r[2] != NULL) { + fprintf (stderr, "test_glob_expand_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_glob_expand_2_skip (void) +{ + const char *str; + + str = getenv ("SKIP_TEST_GLOB_EXPAND_2"); + if (str && strcmp (str, "1") == 0) return 1; + str = getenv ("SKIP_TEST_GLOB_EXPAND"); + if (str && strcmp (str, "1") == 0) return 1; + return 0; +} + +static int test_glob_expand_2 (void) +{ + if (test_glob_expand_2_skip ()) { + printf ("%s skipped (reason: SKIP_TEST_* variable set)\n", "test_glob_expand_2"); + return 0; + } + + /* InitBasicFS for test_glob_expand_2: create ext2 on /dev/sda1 */ + { + char device[] = "/dev/sda"; + 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"; + 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"; + int r; + suppress_error = 0; + r = guestfs_mkfs (g, fstype, device); + if (r == -1) + return -1; + } + { + char device[] = "/dev/sda1"; + char mountpoint[] = "/"; + int r; + suppress_error = 0; + r = guestfs_mount (g, device, mountpoint); + if (r == -1) + return -1; + } + /* TestOutputList for glob_expand (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 path[] = "/a/b/c/e"; + int r; + suppress_error = 0; + r = guestfs_touch (g, path); + if (r == -1) + return -1; + } + { + char pattern[] = "/a/*/x/*"; + char **r; + int i; + suppress_error = 0; + r = guestfs_glob_expand (g, pattern); + if (r == NULL) + return -1; + if (r[0] != NULL) { + fprintf (stderr, "test_glob_expand_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 void print_error (guestfs_h *g, void *data, const char *msg) +static int test_ntfs_3g_probe_0_skip (void) { - if (!suppress_error) - fprintf (stderr, "%s\n", msg); + const char *str; + + str = getenv ("SKIP_TEST_NTFS_3G_PROBE_0"); + if (str && strcmp (str, "1") == 0) return 1; + str = getenv ("SKIP_TEST_NTFS_3G_PROBE"); + if (str && strcmp (str, "1") == 0) return 1; + return 0; } -static void print_strings (char * const * const argv) +static int test_ntfs_3g_probe_0 (void) { - int argc; + if (test_ntfs_3g_probe_0_skip ()) { + printf ("%s skipped (reason: SKIP_TEST_* variable set)\n", "test_ntfs_3g_probe_0"); + return 0; + } - for (argc = 0; argv[argc] != NULL; ++argc) - printf ("\t%s\n", argv[argc]); + /* InitNone|InitEmpty for test_ntfs_3g_probe_0 */ + { + char device[] = "/dev/sda"; + int r; + suppress_error = 0; + r = guestfs_blockdev_setrw (g, device); + if (r == -1) + return -1; + } + { + int r; + suppress_error = 0; + r = guestfs_umount_all (g); + if (r == -1) + return -1; + } + { + int r; + suppress_error = 0; + r = guestfs_lvm_remove_all (g); + if (r == -1) + return -1; + } + /* TestOutputInt for ntfs_3g_probe (0) */ + { + char device[] = "/dev/sda"; + 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[] = "ntfs"; + char device[] = "/dev/sda1"; + int r; + suppress_error = 0; + r = guestfs_mkfs (g, fstype, device); + if (r == -1) + return -1; + } + { + char device[] = "/dev/sda1"; + int r; + suppress_error = 0; + r = guestfs_ntfs_3g_probe (g, 1, device); + if (r == -1) + return -1; + if (r != 0) { + fprintf (stderr, "test_ntfs_3g_probe_0: expected 0 but got %d\n", (int) r); + return -1; + } + } + return 0; } -/* -static void print_table (char * const * const argv) +static int test_ntfs_3g_probe_1_skip (void) { - int i; + const char *str; - for (i = 0; argv[i] != NULL; i += 2) - printf ("%s: %s\n", argv[i], argv[i+1]); + str = getenv ("SKIP_TEST_NTFS_3G_PROBE_1"); + if (str && strcmp (str, "1") == 0) return 1; + str = getenv ("SKIP_TEST_NTFS_3G_PROBE"); + if (str && strcmp (str, "1") == 0) return 1; + return 0; } -*/ -static void no_test_warnings (void) +static int test_ntfs_3g_probe_1 (void) { - fprintf (stderr, "warning: \"guestfs_test0\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rint\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rinterr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rint64\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rint64err\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rbool\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rboolerr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rconststring\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rconststringerr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstring\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstringerr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstringlist\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstringlisterr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rintbool\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rintboolerr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rpvlist\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rpvlisterr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rvglist\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rvglisterr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rlvlist\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rlvlisterr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstat\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstaterr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstatvfs\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rstatvfserr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rhashtable\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_test0rhashtableerr\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_launch\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_wait_ready\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_kill_subprocess\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_add_drive\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_add_cdrom\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_add_drive_ro\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_config\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_set_qemu\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_get_qemu\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_set_path\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_get_path\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_set_append\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_get_append\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_set_autosync\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_get_autosync\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_set_verbose\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_get_verbose\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_is_ready\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_is_config\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_is_launching\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_is_busy\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_get_state\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_set_busy\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_set_ready\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_end_busy\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_ll\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_pvs_full\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_vgs_full\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_lvs_full\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_init\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_close\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_defvar\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_defnode\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_get\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_set\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_insert\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_rm\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_mv\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_match\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_save\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_load\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_aug_ls\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_chmod\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_chown\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_sfdisk\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_lvm_remove_all\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_tune2fs_l\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_blockdev_setbsz\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_tar_out\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_tgz_out\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_mount_options\" has no tests\n"); - fprintf (stderr, "warning: \"guestfs_mount_vfs\" has no tests\n"); - 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"); - fprintf (stderr, "warning: \"guestfs_e2fsck_f\" has no tests\n"); + if (test_ntfs_3g_probe_1_skip ()) { + printf ("%s skipped (reason: SKIP_TEST_* variable set)\n", "test_ntfs_3g_probe_1"); + return 0; + } + + /* InitNone|InitEmpty for test_ntfs_3g_probe_1 */ + { + char device[] = "/dev/sda"; + int r; + suppress_error = 0; + r = guestfs_blockdev_setrw (g, device); + if (r == -1) + return -1; + } + { + int r; + suppress_error = 0; + r = guestfs_umount_all (g); + if (r == -1) + return -1; + } + { + int r; + suppress_error = 0; + r = guestfs_lvm_remove_all (g); + if (r == -1) + return -1; + } + /* TestOutputInt for ntfs_3g_probe (1) */ + { + char device[] = "/dev/sda"; + 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"; + int r; + suppress_error = 0; + r = guestfs_mkfs (g, fstype, device); + if (r == -1) + return -1; + } + { + char device[] = "/dev/sda1"; + int r; + suppress_error = 0; + r = guestfs_ntfs_3g_probe (g, 1, device); + if (r == -1) + return -1; + if (r != 12) { + fprintf (stderr, "test_ntfs_3g_probe_1: expected 12 but got %d\n", (int) r); + return -1; + } + } + return 0; } static int test_sleep_0_skip (void) @@ -176,7 +877,6 @@ static int test_sleep_0 (void) /* InitNone|InitEmpty for test_sleep_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -229,7 +929,6 @@ 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); @@ -252,7 +951,6 @@ static int test_find_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -267,7 +965,6 @@ static int test_find_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -276,7 +973,6 @@ static int test_find_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -338,7 +1034,6 @@ 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); @@ -361,7 +1056,6 @@ static int test_find_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -376,7 +1070,6 @@ static int test_find_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -385,7 +1078,6 @@ static int test_find_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -507,7 +1199,6 @@ 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); @@ -530,7 +1221,6 @@ static int test_find_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -545,7 +1235,6 @@ static int test_find_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -554,7 +1243,6 @@ static int test_find_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -644,7 +1332,6 @@ 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); @@ -669,7 +1356,6 @@ static int test_lvresize_0 (void) char expected[] = "test content"; { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -683,7 +1369,6 @@ static int test_lvresize_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -693,7 +1378,6 @@ static int test_lvresize_0 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -818,7 +1502,6 @@ 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); @@ -843,7 +1526,6 @@ static int test_zerofree_0 (void) char expected[] = "test file"; { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -858,7 +1540,6 @@ static int test_zerofree_0 (void) { char fstype[] = "ext3"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -867,7 +1548,6 @@ static int test_zerofree_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -886,7 +1566,6 @@ static int test_zerofree_0 (void) } { char pathordevice[] = "/dev/sda1"; - pathordevice[5] = devchar; int r; suppress_error = 0; r = guestfs_umount (g, pathordevice); @@ -895,7 +1574,6 @@ static int test_zerofree_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_zerofree (g, device); @@ -904,7 +1582,6 @@ static int test_zerofree_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -949,7 +1626,6 @@ static int test_hexdump_0 (void) /* InitBasicFS for test_hexdump_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -972,7 +1648,6 @@ static int test_hexdump_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -987,7 +1662,6 @@ static int test_hexdump_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -996,7 +1670,6 @@ static int test_hexdump_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1052,7 +1725,6 @@ static int test_strings_e_0 (void) /* InitBasicFS for test_strings_e_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1075,7 +1747,6 @@ static int test_strings_e_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -1090,7 +1761,6 @@ static int test_strings_e_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -1099,7 +1769,6 @@ static int test_strings_e_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1181,7 +1850,6 @@ static int test_strings_0 (void) /* InitBasicFS for test_strings_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1204,7 +1872,6 @@ static int test_strings_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -1219,7 +1886,6 @@ static int test_strings_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -1228,7 +1894,6 @@ static int test_strings_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1311,7 +1976,6 @@ static int test_strings_1 (void) /* InitBasicFS for test_strings_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1334,7 +1998,6 @@ static int test_strings_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -1349,7 +2012,6 @@ static int test_strings_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -1358,7 +2020,6 @@ static int test_strings_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1416,7 +2077,6 @@ static int test_equal_0 (void) /* InitBasicFS for test_equal_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1439,7 +2099,6 @@ static int test_equal_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -1454,7 +2113,6 @@ static int test_equal_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -1463,7 +2121,6 @@ static int test_equal_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1527,7 +2184,6 @@ static int test_equal_1 (void) /* InitBasicFS for test_equal_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1550,7 +2206,6 @@ static int test_equal_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -1565,7 +2220,6 @@ static int test_equal_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -1574,7 +2228,6 @@ static int test_equal_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1638,7 +2291,6 @@ static int test_equal_2 (void) /* InitBasicFS for test_equal_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1661,7 +2313,6 @@ static int test_equal_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -1676,7 +2327,6 @@ static int test_equal_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -1685,7 +2335,6 @@ static int test_equal_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1727,7 +2376,6 @@ static int test_ping_daemon_0 (void) /* InitNone|InitEmpty for test_ping_daemon_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1780,7 +2428,6 @@ static int test_dmesg_0 (void) /* InitNone|InitEmpty for test_dmesg_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1834,7 +2481,6 @@ static int test_drop_caches_0 (void) /* InitNone|InitEmpty for test_drop_caches_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1887,7 +2533,6 @@ static int test_mv_0 (void) /* InitBasicFS for test_mv_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -1910,7 +2555,6 @@ static int test_mv_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -1925,7 +2569,6 @@ static int test_mv_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -1934,7 +2577,6 @@ static int test_mv_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -1999,7 +2641,6 @@ static int test_mv_1 (void) /* InitBasicFS for test_mv_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2022,7 +2663,6 @@ static int test_mv_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2037,7 +2677,6 @@ static int test_mv_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2046,7 +2685,6 @@ static int test_mv_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2109,7 +2747,6 @@ static int test_cp_a_0 (void) /* InitBasicFS for test_cp_a_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2132,7 +2769,6 @@ static int test_cp_a_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2147,7 +2783,6 @@ static int test_cp_a_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2156,7 +2791,6 @@ static int test_cp_a_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2237,7 +2871,6 @@ static int test_cp_0 (void) /* InitBasicFS for test_cp_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2260,7 +2893,6 @@ static int test_cp_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2275,7 +2907,6 @@ static int test_cp_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2284,7 +2915,6 @@ static int test_cp_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2349,7 +2979,6 @@ static int test_cp_1 (void) /* InitBasicFS for test_cp_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2372,7 +3001,6 @@ static int test_cp_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2387,7 +3015,6 @@ static int test_cp_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2396,7 +3023,6 @@ static int test_cp_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2459,7 +3085,6 @@ static int test_cp_2 (void) /* InitBasicFS for test_cp_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2482,7 +3107,6 @@ static int test_cp_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2497,7 +3121,6 @@ static int test_cp_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2506,7 +3129,6 @@ static int test_cp_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2579,7 +3201,6 @@ static int test_grub_install_0 (void) /* InitBasicFS for test_grub_install_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2602,7 +3223,6 @@ static int test_grub_install_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2617,7 +3237,6 @@ static int test_grub_install_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2626,7 +3245,6 @@ static int test_grub_install_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2638,7 +3256,6 @@ static int test_grub_install_0 (void) { char root[] = "/"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_grub_install (g, root, device); @@ -2681,7 +3298,6 @@ static int test_zero_0 (void) /* InitBasicFS for test_zero_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2704,7 +3320,6 @@ static int test_zero_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2719,7 +3334,6 @@ static int test_zero_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2728,7 +3342,6 @@ static int test_zero_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2740,7 +3353,6 @@ static int test_zero_0 (void) char expected[] = "data"; { char pathordevice[] = "/dev/sda1"; - pathordevice[5] = devchar; int r; suppress_error = 0; r = guestfs_umount (g, pathordevice); @@ -2749,7 +3361,6 @@ static int test_zero_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_zero (g, device); @@ -2758,7 +3369,6 @@ static int test_zero_0 (void) } { char path[] = "/dev/sda1"; - path[5] = devchar; char *r; suppress_error = 0; r = guestfs_file (g, path); @@ -2794,7 +3404,6 @@ static int test_fsck_0 (void) /* InitBasicFS for test_fsck_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2817,7 +3426,6 @@ static int test_fsck_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2832,7 +3440,6 @@ static int test_fsck_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2841,7 +3448,6 @@ static int test_fsck_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2852,7 +3458,6 @@ static int test_fsck_0 (void) /* TestOutputInt for fsck (0) */ { char pathordevice[] = "/dev/sda1"; - pathordevice[5] = devchar; int r; suppress_error = 0; r = guestfs_umount (g, pathordevice); @@ -2862,7 +3467,6 @@ static int test_fsck_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_fsck (g, fstype, device); @@ -2897,7 +3501,6 @@ static int test_fsck_1 (void) /* InitBasicFS for test_fsck_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -2920,7 +3523,6 @@ static int test_fsck_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -2935,7 +3537,6 @@ static int test_fsck_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -2944,7 +3545,6 @@ static int test_fsck_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -2955,7 +3555,6 @@ static int test_fsck_1 (void) /* TestOutputInt for fsck (1) */ { char pathordevice[] = "/dev/sda1"; - pathordevice[5] = devchar; int r; suppress_error = 0; r = guestfs_umount (g, pathordevice); @@ -2964,7 +3563,6 @@ static int test_fsck_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_zero (g, device); @@ -2974,7 +3572,6 @@ static int test_fsck_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_fsck (g, fstype, device); @@ -3009,7 +3606,6 @@ static int test_set_e2uuid_0 (void) /* InitBasicFS for test_set_e2uuid_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3032,7 +3628,6 @@ static int test_set_e2uuid_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3047,7 +3642,6 @@ static int test_set_e2uuid_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -3056,7 +3650,6 @@ static int test_set_e2uuid_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -3068,7 +3661,6 @@ static int test_set_e2uuid_0 (void) char expected[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d"; { char device[] = "/dev/sda1"; - device[5] = devchar; char uuid[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d"; int r; suppress_error = 0; @@ -3078,7 +3670,6 @@ static int test_set_e2uuid_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char *r; suppress_error = 0; r = guestfs_get_e2uuid (g, device); @@ -3114,7 +3705,6 @@ static int test_set_e2uuid_1 (void) /* InitBasicFS for test_set_e2uuid_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3137,7 +3727,6 @@ static int test_set_e2uuid_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3152,7 +3741,6 @@ static int test_set_e2uuid_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -3161,7 +3749,6 @@ static int test_set_e2uuid_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -3173,7 +3760,6 @@ static int test_set_e2uuid_1 (void) char expected[] = ""; { char device[] = "/dev/sda1"; - device[5] = devchar; char uuid[] = "clear"; int r; suppress_error = 0; @@ -3183,7 +3769,6 @@ static int test_set_e2uuid_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char *r; suppress_error = 0; r = guestfs_get_e2uuid (g, device); @@ -3219,7 +3804,6 @@ static int test_set_e2uuid_2 (void) /* InitBasicFS for test_set_e2uuid_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3242,7 +3826,6 @@ static int test_set_e2uuid_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3257,7 +3840,6 @@ static int test_set_e2uuid_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -3266,7 +3848,6 @@ static int test_set_e2uuid_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -3277,7 +3858,6 @@ static int test_set_e2uuid_2 (void) /* TestRun for set_e2uuid (2) */ { char device[] = "/dev/sda1"; - device[5] = devchar; char uuid[] = "random"; int r; suppress_error = 0; @@ -3309,7 +3889,6 @@ static int test_set_e2uuid_3 (void) /* InitBasicFS for test_set_e2uuid_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3332,7 +3911,6 @@ static int test_set_e2uuid_3 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3347,7 +3925,6 @@ static int test_set_e2uuid_3 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -3356,7 +3933,6 @@ static int test_set_e2uuid_3 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -3367,7 +3943,6 @@ static int test_set_e2uuid_3 (void) /* TestRun for set_e2uuid (3) */ { char device[] = "/dev/sda1"; - device[5] = devchar; char uuid[] = "time"; int r; suppress_error = 0; @@ -3399,7 +3974,6 @@ static int test_set_e2label_0 (void) /* InitBasicFS for test_set_e2label_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3422,7 +3996,6 @@ static int test_set_e2label_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3437,7 +4010,6 @@ static int test_set_e2label_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -3446,7 +4018,6 @@ static int test_set_e2label_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -3458,7 +4029,6 @@ static int test_set_e2label_0 (void) char expected[] = "testlabel"; { char device[] = "/dev/sda1"; - device[5] = devchar; char label[] = "testlabel"; int r; suppress_error = 0; @@ -3468,7 +4038,6 @@ static int test_set_e2label_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char *r; suppress_error = 0; r = guestfs_get_e2label (g, device); @@ -3504,7 +4073,6 @@ static int test_pvremove_0 (void) /* InitNone|InitEmpty for test_pvremove_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3525,10 +4093,9 @@ static int test_pvremove_0 (void) if (r == -1) return -1; } - /* TestOutputList for pvremove (0) */ + /* TestOutputListOfDevices for pvremove (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3542,7 +4109,6 @@ static int test_pvremove_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -3552,7 +4118,6 @@ static int test_pvremove_0 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -3591,7 +4156,6 @@ static int test_pvremove_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvremove (g, device); @@ -3638,7 +4202,6 @@ static int test_pvremove_1 (void) /* InitNone|InitEmpty for test_pvremove_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3659,10 +4222,9 @@ static int test_pvremove_1 (void) if (r == -1) return -1; } - /* TestOutputList for pvremove (1) */ + /* TestOutputListOfDevices for pvremove (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3676,7 +4238,6 @@ static int test_pvremove_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -3686,7 +4247,6 @@ static int test_pvremove_1 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -3725,7 +4285,6 @@ static int test_pvremove_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvremove (g, device); @@ -3772,7 +4331,6 @@ static int test_pvremove_2 (void) /* InitNone|InitEmpty for test_pvremove_2 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3793,10 +4351,9 @@ static int test_pvremove_2 (void) if (r == -1) return -1; } - /* TestOutputList for pvremove (2) */ + /* TestOutputListOfDevices for pvremove (2) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3810,7 +4367,6 @@ static int test_pvremove_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -3820,7 +4376,6 @@ static int test_pvremove_2 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -3859,7 +4414,6 @@ static int test_pvremove_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvremove (g, device); @@ -3906,7 +4460,6 @@ static int test_vgremove_0 (void) /* InitNone|InitEmpty for test_vgremove_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -3930,7 +4483,6 @@ static int test_vgremove_0 (void) /* TestOutputList for vgremove (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -3944,7 +4496,6 @@ static int test_vgremove_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -3954,7 +4505,6 @@ static int test_vgremove_0 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -4031,7 +4581,6 @@ static int test_vgremove_1 (void) /* InitNone|InitEmpty for test_vgremove_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4055,7 +4604,6 @@ static int test_vgremove_1 (void) /* TestOutputList for vgremove (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4069,7 +4617,6 @@ static int test_vgremove_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -4079,7 +4626,6 @@ static int test_vgremove_1 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -4156,7 +4702,6 @@ static int test_lvremove_0 (void) /* InitNone|InitEmpty for test_lvremove_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4180,7 +4725,6 @@ static int test_lvremove_0 (void) /* TestOutputList for lvremove (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4194,7 +4738,6 @@ static int test_lvremove_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -4204,7 +4747,6 @@ static int test_lvremove_0 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -4293,7 +4835,6 @@ static int test_lvremove_1 (void) /* InitNone|InitEmpty for test_lvremove_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4317,7 +4858,6 @@ static int test_lvremove_1 (void) /* TestOutputList for lvremove (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4331,7 +4871,6 @@ static int test_lvremove_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -4341,7 +4880,6 @@ static int test_lvremove_1 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -4418,7 +4956,6 @@ static int test_lvremove_2 (void) /* InitNone|InitEmpty for test_lvremove_2 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4442,7 +4979,6 @@ static int test_lvremove_2 (void) /* TestOutputList for lvremove (2) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4456,7 +4992,6 @@ static int test_lvremove_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -4466,7 +5001,6 @@ static int test_lvremove_2 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -4555,7 +5089,6 @@ static int test_mount_ro_0 (void) /* InitBasicFS for test_mount_ro_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4578,7 +5111,6 @@ static int test_mount_ro_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4593,7 +5125,6 @@ static int test_mount_ro_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -4602,7 +5133,6 @@ static int test_mount_ro_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -4621,7 +5151,6 @@ static int test_mount_ro_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -4661,7 +5190,6 @@ static int test_mount_ro_1 (void) /* InitBasicFS for test_mount_ro_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4684,7 +5212,6 @@ static int test_mount_ro_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4699,7 +5226,6 @@ static int test_mount_ro_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -4708,7 +5234,6 @@ static int test_mount_ro_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -4737,7 +5262,6 @@ static int test_mount_ro_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -4782,7 +5306,6 @@ static int test_tgz_in_0 (void) /* InitBasicFS for test_tgz_in_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4805,7 +5328,6 @@ static int test_tgz_in_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4820,7 +5342,6 @@ static int test_tgz_in_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -4829,7 +5350,6 @@ static int test_tgz_in_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -4884,7 +5404,6 @@ static int test_tar_in_0 (void) /* InitBasicFS for test_tar_in_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -4907,7 +5426,6 @@ static int test_tar_in_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -4922,7 +5440,6 @@ static int test_tar_in_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -4931,7 +5448,6 @@ static int test_tar_in_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -4986,7 +5502,6 @@ static int test_checksum_0 (void) /* InitBasicFS for test_checksum_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5009,7 +5524,6 @@ static int test_checksum_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5024,7 +5538,6 @@ static int test_checksum_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5033,7 +5546,6 @@ static int test_checksum_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5090,7 +5602,6 @@ static int test_checksum_1 (void) /* InitBasicFS for test_checksum_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5113,7 +5624,6 @@ static int test_checksum_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5128,7 +5638,6 @@ static int test_checksum_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5137,7 +5646,6 @@ static int test_checksum_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5180,7 +5688,6 @@ static int test_checksum_2 (void) /* InitBasicFS for test_checksum_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5203,7 +5710,6 @@ static int test_checksum_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5218,7 +5724,6 @@ static int test_checksum_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5227,7 +5732,6 @@ static int test_checksum_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5284,7 +5788,6 @@ static int test_checksum_3 (void) /* InitBasicFS for test_checksum_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5307,7 +5810,6 @@ static int test_checksum_3 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5322,7 +5824,6 @@ static int test_checksum_3 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5331,7 +5832,6 @@ static int test_checksum_3 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5388,7 +5888,6 @@ static int test_checksum_4 (void) /* InitBasicFS for test_checksum_4: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5411,7 +5910,6 @@ static int test_checksum_4 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5426,7 +5924,6 @@ static int test_checksum_4 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5435,7 +5932,6 @@ static int test_checksum_4 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5492,7 +5988,6 @@ static int test_checksum_5 (void) /* InitBasicFS for test_checksum_5: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5515,7 +6010,6 @@ static int test_checksum_5 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5530,7 +6024,6 @@ static int test_checksum_5 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5539,7 +6032,6 @@ static int test_checksum_5 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5596,7 +6088,6 @@ static int test_checksum_6 (void) /* InitBasicFS for test_checksum_6: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5619,7 +6110,6 @@ static int test_checksum_6 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5634,7 +6124,6 @@ static int test_checksum_6 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5643,7 +6132,6 @@ static int test_checksum_6 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5700,7 +6188,6 @@ static int test_checksum_7 (void) /* InitBasicFS for test_checksum_7: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5723,7 +6210,6 @@ static int test_checksum_7 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5738,7 +6224,6 @@ static int test_checksum_7 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5747,7 +6232,6 @@ static int test_checksum_7 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5804,7 +6288,6 @@ static int test_checksum_8 (void) /* InitBasicFS for test_checksum_8: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5827,7 +6310,6 @@ static int test_checksum_8 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5842,7 +6324,6 @@ static int test_checksum_8 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5851,7 +6332,6 @@ static int test_checksum_8 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -5862,12 +6342,13 @@ static int test_checksum_8 (void) /* TestOutput for checksum (8) */ char expected[] = "46d6ca27ee07cdc6fa99c2e138cc522c"; { + char options[] = "ro"; + char vfstype[] = "squashfs"; char device[] = "/dev/sdd"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; - r = guestfs_mount (g, device, mountpoint); + r = guestfs_mount_vfs (g, options, vfstype, device, mountpoint); if (r == -1) return -1; } @@ -5909,7 +6390,6 @@ static int test_download_0 (void) /* InitBasicFS for test_download_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -5932,7 +6412,6 @@ static int test_download_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -5947,7 +6426,6 @@ static int test_download_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -5956,7 +6434,6 @@ static int test_download_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -6028,7 +6505,6 @@ static int test_upload_0 (void) /* InitBasicFS for test_upload_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6051,7 +6527,6 @@ static int test_upload_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -6066,7 +6541,6 @@ static int test_upload_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -6075,7 +6549,6 @@ static int test_upload_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -6131,7 +6604,6 @@ static int test_blockdev_rereadpt_0 (void) /* InitNone|InitEmpty for test_blockdev_rereadpt_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6155,7 +6627,6 @@ static int test_blockdev_rereadpt_0 (void) /* TestRun for blockdev_rereadpt (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_rereadpt (g, device); @@ -6186,7 +6657,6 @@ static int test_blockdev_flushbufs_0 (void) /* InitNone|InitEmpty for test_blockdev_flushbufs_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6210,7 +6680,6 @@ static int test_blockdev_flushbufs_0 (void) /* TestRun for blockdev_flushbufs (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_flushbufs (g, device); @@ -6241,7 +6710,6 @@ static int test_blockdev_getsize64_0 (void) /* InitNone|InitEmpty for test_blockdev_getsize64_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6265,7 +6733,6 @@ static int test_blockdev_getsize64_0 (void) /* TestOutputInt for blockdev_getsize64 (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int64_t r; suppress_error = 0; r = guestfs_blockdev_getsize64 (g, device); @@ -6300,7 +6767,6 @@ static int test_blockdev_getsz_0 (void) /* InitNone|InitEmpty for test_blockdev_getsz_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6324,7 +6790,6 @@ static int test_blockdev_getsz_0 (void) /* TestOutputInt for blockdev_getsz (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int64_t r; suppress_error = 0; r = guestfs_blockdev_getsz (g, device); @@ -6359,7 +6824,6 @@ static int test_blockdev_getbsz_0 (void) /* InitNone|InitEmpty for test_blockdev_getbsz_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6383,7 +6847,6 @@ static int test_blockdev_getbsz_0 (void) /* TestOutputInt for blockdev_getbsz (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_getbsz (g, device); @@ -6418,7 +6881,6 @@ static int test_blockdev_getss_0 (void) /* InitNone|InitEmpty for test_blockdev_getss_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6442,7 +6904,6 @@ static int test_blockdev_getss_0 (void) /* TestOutputInt for blockdev_getss (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_getss (g, device); @@ -6477,7 +6938,6 @@ static int test_blockdev_getro_0 (void) /* InitNone|InitEmpty for test_blockdev_getro_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6501,7 +6961,6 @@ static int test_blockdev_getro_0 (void) /* TestOutputTrue for blockdev_getro (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setro (g, device); @@ -6510,7 +6969,6 @@ static int test_blockdev_getro_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_getro (g, device); @@ -6545,7 +7003,6 @@ static int test_blockdev_setrw_0 (void) /* InitNone|InitEmpty for test_blockdev_setrw_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6569,7 +7026,6 @@ static int test_blockdev_setrw_0 (void) /* TestOutputFalse for blockdev_setrw (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6578,7 +7034,6 @@ static int test_blockdev_setrw_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_getro (g, device); @@ -6613,7 +7068,6 @@ static int test_blockdev_setro_0 (void) /* InitNone|InitEmpty for test_blockdev_setro_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6637,7 +7091,6 @@ static int test_blockdev_setro_0 (void) /* TestOutputTrue for blockdev_setro (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setro (g, device); @@ -6646,7 +7099,6 @@ static int test_blockdev_setro_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_getro (g, device); @@ -6681,7 +7133,6 @@ static int test_statvfs_0 (void) /* InitBasicFS for test_statvfs_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6704,7 +7155,6 @@ static int test_statvfs_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -6719,7 +7169,6 @@ static int test_statvfs_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -6728,7 +7177,6 @@ static int test_statvfs_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -6785,7 +7233,6 @@ static int test_lstat_0 (void) /* InitBasicFS for test_lstat_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6808,7 +7255,6 @@ static int test_lstat_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -6823,7 +7269,6 @@ static int test_lstat_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -6832,7 +7277,6 @@ static int test_lstat_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -6887,7 +7331,6 @@ static int test_stat_0 (void) /* InitBasicFS for test_stat_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -6910,7 +7353,6 @@ static int test_stat_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -6925,7 +7367,6 @@ static int test_stat_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -6934,7 +7375,6 @@ static int test_stat_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -6989,7 +7429,6 @@ static int test_command_lines_0 (void) /* InitBasicFS for test_command_lines_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -7012,7 +7451,6 @@ static int test_command_lines_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -7027,7 +7465,6 @@ static int test_command_lines_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -7036,7 +7473,6 @@ static int test_command_lines_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -7120,7 +7556,6 @@ static int test_command_lines_1 (void) /* InitBasicFS for test_command_lines_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -7143,7 +7578,6 @@ static int test_command_lines_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -7158,7 +7592,6 @@ static int test_command_lines_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -7167,7 +7600,6 @@ static int test_command_lines_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -7251,7 +7683,6 @@ static int test_command_lines_2 (void) /* InitBasicFS for test_command_lines_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -7274,7 +7705,6 @@ static int test_command_lines_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -7289,7 +7719,6 @@ static int test_command_lines_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -7298,7 +7727,6 @@ static int test_command_lines_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -7394,7 +7822,6 @@ static int test_command_lines_3 (void) /* InitBasicFS for test_command_lines_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -7417,7 +7844,6 @@ static int test_command_lines_3 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -7432,7 +7858,6 @@ static int test_command_lines_3 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -7441,7 +7866,6 @@ static int test_command_lines_3 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -7537,7 +7961,6 @@ static int test_command_lines_4 (void) /* InitBasicFS for test_command_lines_4: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -7560,7 +7983,6 @@ static int test_command_lines_4 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -7575,7 +7997,6 @@ static int test_command_lines_4 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -7584,7 +8005,6 @@ static int test_command_lines_4 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -7692,7 +8112,6 @@ static int test_command_lines_5 (void) /* InitBasicFS for test_command_lines_5: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -7715,7 +8134,6 @@ static int test_command_lines_5 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -7730,7 +8148,6 @@ static int test_command_lines_5 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -7739,7 +8156,6 @@ static int test_command_lines_5 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -7859,7 +8275,6 @@ static int test_command_lines_6 (void) /* InitBasicFS for test_command_lines_6: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -7882,7 +8297,6 @@ static int test_command_lines_6 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -7897,7 +8311,6 @@ static int test_command_lines_6 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -7906,7 +8319,6 @@ static int test_command_lines_6 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -7978,7 +8390,6 @@ static int test_command_lines_7 (void) /* InitBasicFS for test_command_lines_7: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8001,7 +8412,6 @@ static int test_command_lines_7 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8016,7 +8426,6 @@ static int test_command_lines_7 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8025,7 +8434,6 @@ static int test_command_lines_7 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -8109,7 +8517,6 @@ static int test_command_lines_8 (void) /* InitBasicFS for test_command_lines_8: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8132,7 +8539,6 @@ static int test_command_lines_8 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8147,7 +8553,6 @@ static int test_command_lines_8 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8156,7 +8561,6 @@ static int test_command_lines_8 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -8252,7 +8656,6 @@ static int test_command_lines_9 (void) /* InitBasicFS for test_command_lines_9: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8275,7 +8678,6 @@ static int test_command_lines_9 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8290,7 +8692,6 @@ static int test_command_lines_9 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8299,7 +8700,6 @@ static int test_command_lines_9 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -8395,7 +8795,6 @@ static int test_command_lines_10 (void) /* InitBasicFS for test_command_lines_10: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8418,7 +8817,6 @@ static int test_command_lines_10 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8433,7 +8831,6 @@ static int test_command_lines_10 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8442,7 +8839,6 @@ static int test_command_lines_10 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -8538,7 +8934,6 @@ static int test_command_0 (void) /* InitBasicFS for test_command_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8561,7 +8956,6 @@ static int test_command_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8576,7 +8970,6 @@ static int test_command_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8585,7 +8978,6 @@ static int test_command_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -8654,7 +9046,6 @@ static int test_command_1 (void) /* InitBasicFS for test_command_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8677,7 +9068,6 @@ static int test_command_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8692,7 +9082,6 @@ static int test_command_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8701,7 +9090,6 @@ static int test_command_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -8770,7 +9158,6 @@ static int test_command_2 (void) /* InitBasicFS for test_command_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8793,7 +9180,6 @@ static int test_command_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8808,7 +9194,6 @@ static int test_command_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8817,7 +9202,6 @@ static int test_command_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -8886,7 +9270,6 @@ static int test_command_3 (void) /* InitBasicFS for test_command_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -8909,7 +9292,6 @@ static int test_command_3 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -8924,7 +9306,6 @@ static int test_command_3 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -8933,7 +9314,6 @@ static int test_command_3 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9002,7 +9382,6 @@ static int test_command_4 (void) /* InitBasicFS for test_command_4: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9025,7 +9404,6 @@ static int test_command_4 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9040,7 +9418,6 @@ static int test_command_4 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9049,7 +9426,6 @@ static int test_command_4 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9118,7 +9494,6 @@ static int test_command_5 (void) /* InitBasicFS for test_command_5: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9141,7 +9516,6 @@ static int test_command_5 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9156,7 +9530,6 @@ static int test_command_5 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9165,7 +9538,6 @@ static int test_command_5 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9234,7 +9606,6 @@ static int test_command_6 (void) /* InitBasicFS for test_command_6: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9257,7 +9628,6 @@ static int test_command_6 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9272,7 +9642,6 @@ static int test_command_6 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9281,7 +9650,6 @@ static int test_command_6 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9350,7 +9718,6 @@ static int test_command_7 (void) /* InitBasicFS for test_command_7: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9373,7 +9740,6 @@ static int test_command_7 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9388,7 +9754,6 @@ static int test_command_7 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9397,7 +9762,6 @@ static int test_command_7 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9466,7 +9830,6 @@ static int test_command_8 (void) /* InitBasicFS for test_command_8: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9489,7 +9852,6 @@ static int test_command_8 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9504,7 +9866,6 @@ static int test_command_8 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9513,7 +9874,6 @@ static int test_command_8 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9582,7 +9942,6 @@ static int test_command_9 (void) /* InitBasicFS for test_command_9: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9605,7 +9964,6 @@ static int test_command_9 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9620,7 +9978,6 @@ static int test_command_9 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9629,7 +9986,6 @@ static int test_command_9 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9698,7 +10054,6 @@ static int test_command_10 (void) /* InitBasicFS for test_command_10: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9721,7 +10076,6 @@ static int test_command_10 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9736,7 +10090,6 @@ static int test_command_10 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9745,7 +10098,6 @@ static int test_command_10 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9814,7 +10166,6 @@ static int test_command_11 (void) /* InitBasicFS for test_command_11: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9837,7 +10188,6 @@ static int test_command_11 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9852,7 +10202,6 @@ static int test_command_11 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9861,7 +10210,6 @@ static int test_command_11 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -9923,7 +10271,6 @@ static int test_file_0 (void) /* InitBasicFS for test_file_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -9946,7 +10293,6 @@ static int test_file_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -9961,7 +10307,6 @@ static int test_file_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -9970,7 +10315,6 @@ static int test_file_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10025,7 +10369,6 @@ static int test_file_1 (void) /* InitBasicFS for test_file_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10048,7 +10391,6 @@ static int test_file_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10063,7 +10405,6 @@ static int test_file_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10072,7 +10413,6 @@ static int test_file_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10128,7 +10468,6 @@ static int test_file_2 (void) /* InitBasicFS for test_file_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10151,7 +10490,6 @@ static int test_file_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10166,7 +10504,6 @@ static int test_file_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10175,7 +10512,6 @@ static int test_file_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10217,7 +10553,6 @@ static int test_umount_all_0 (void) /* InitBasicFS for test_umount_all_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10240,7 +10575,6 @@ static int test_umount_all_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10255,7 +10589,6 @@ static int test_umount_all_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10264,7 +10597,6 @@ static int test_umount_all_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10320,7 +10652,6 @@ static int test_umount_all_1 (void) /* InitNone|InitEmpty for test_umount_all_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10344,7 +10675,6 @@ static int test_umount_all_1 (void) /* TestOutputList for umount_all (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -10363,7 +10693,6 @@ static int test_umount_all_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10373,7 +10702,6 @@ static int test_umount_all_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda2"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10383,7 +10711,6 @@ static int test_umount_all_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda3"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10392,7 +10719,6 @@ static int test_umount_all_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10410,7 +10736,6 @@ static int test_umount_all_1 (void) } { char device[] = "/dev/sda2"; - device[5] = devchar; char mountpoint[] = "/mp1"; int r; suppress_error = 0; @@ -10428,7 +10753,6 @@ static int test_umount_all_1 (void) } { char device[] = "/dev/sda3"; - device[5] = devchar; char mountpoint[] = "/mp1/mp2"; int r; suppress_error = 0; @@ -10491,7 +10815,6 @@ static int test_mounts_0 (void) /* InitBasicFS for test_mounts_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10514,7 +10837,6 @@ static int test_mounts_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10529,7 +10851,6 @@ static int test_mounts_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10538,7 +10859,6 @@ static int test_mounts_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10546,7 +10866,7 @@ static int test_mounts_0 (void) if (r == -1) return -1; } - /* TestOutputList for mounts (0) */ + /* TestOutputListOfDevices for mounts (0) */ { char **r; int i; @@ -10561,7 +10881,7 @@ static int test_mounts_0 (void) } { char expected[] = "/dev/sda1"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_mounts_0: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -10600,7 +10920,6 @@ static int test_umount_0 (void) /* InitNone|InitEmpty for test_umount_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10621,10 +10940,9 @@ static int test_umount_0 (void) if (r == -1) return -1; } - /* TestOutputList for umount (0) */ + /* TestOutputListOfDevices for umount (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10639,7 +10957,6 @@ static int test_umount_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10648,7 +10965,6 @@ static int test_umount_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10670,7 +10986,7 @@ static int test_umount_0 (void) } { char expected[] = "/dev/sda1"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_umount_0: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -10709,7 +11025,6 @@ static int test_umount_1 (void) /* InitNone|InitEmpty for test_umount_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10733,7 +11048,6 @@ static int test_umount_1 (void) /* TestOutputList for umount (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10748,7 +11062,6 @@ static int test_umount_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10757,7 +11070,6 @@ static int test_umount_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10813,7 +11125,6 @@ static int test_write_file_0 (void) /* InitBasicFS for test_write_file_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10836,7 +11147,6 @@ static int test_write_file_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10851,7 +11161,6 @@ static int test_write_file_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10860,7 +11169,6 @@ static int test_write_file_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -10916,7 +11224,6 @@ static int test_write_file_1 (void) /* InitBasicFS for test_write_file_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -10939,7 +11246,6 @@ static int test_write_file_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -10954,7 +11260,6 @@ static int test_write_file_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -10963,7 +11268,6 @@ static int test_write_file_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -11019,7 +11323,6 @@ static int test_write_file_2 (void) /* InitBasicFS for test_write_file_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11042,7 +11345,6 @@ static int test_write_file_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -11057,7 +11359,6 @@ static int test_write_file_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -11066,7 +11367,6 @@ static int test_write_file_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -11122,7 +11422,6 @@ static int test_write_file_3 (void) /* InitBasicFS for test_write_file_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11145,7 +11444,6 @@ static int test_write_file_3 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -11160,7 +11458,6 @@ static int test_write_file_3 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -11169,7 +11466,6 @@ static int test_write_file_3 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -11225,7 +11521,6 @@ static int test_write_file_4 (void) /* InitBasicFS for test_write_file_4: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11248,7 +11543,6 @@ static int test_write_file_4 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -11263,7 +11557,6 @@ static int test_write_file_4 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -11272,7 +11565,6 @@ static int test_write_file_4 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -11328,7 +11620,6 @@ static int test_write_file_5 (void) /* InitBasicFS for test_write_file_5: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11351,7 +11642,6 @@ static int test_write_file_5 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -11366,7 +11656,6 @@ static int test_write_file_5 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -11375,7 +11664,6 @@ static int test_write_file_5 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -11431,7 +11719,6 @@ static int test_mkfs_0 (void) /* InitNone|InitEmpty for test_mkfs_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11456,7 +11743,6 @@ static int test_mkfs_0 (void) char expected[] = "new file contents"; { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -11471,7 +11757,6 @@ static int test_mkfs_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -11480,7 +11765,6 @@ static int test_mkfs_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -11534,7 +11818,6 @@ static int test_lvcreate_0 (void) /* InitNone|InitEmpty for test_lvcreate_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11558,7 +11841,6 @@ static int test_lvcreate_0 (void) /* TestOutputList for lvcreate (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -11576,7 +11858,6 @@ static int test_lvcreate_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11585,7 +11866,6 @@ static int test_lvcreate_0 (void) } { char device[] = "/dev/sda2"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11594,7 +11874,6 @@ static int test_lvcreate_0 (void) } { char device[] = "/dev/sda3"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11604,9 +11883,7 @@ static int test_lvcreate_0 (void) { char volgroup[] = "VG1"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char physvols_1[] = "/dev/sda2"; - physvols_1[5] = devchar; char *physvols[] = { physvols_0, physvols_1, @@ -11621,7 +11898,6 @@ static int test_lvcreate_0 (void) { char volgroup[] = "VG2"; char physvols_0[] = "/dev/sda3"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -11777,7 +12053,6 @@ static int test_vgcreate_0 (void) /* InitNone|InitEmpty for test_vgcreate_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11801,7 +12076,6 @@ static int test_vgcreate_0 (void) /* TestOutputList for vgcreate (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -11819,7 +12093,6 @@ static int test_vgcreate_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11828,7 +12101,6 @@ static int test_vgcreate_0 (void) } { char device[] = "/dev/sda2"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11837,7 +12109,6 @@ static int test_vgcreate_0 (void) } { char device[] = "/dev/sda3"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11847,9 +12118,7 @@ static int test_vgcreate_0 (void) { char volgroup[] = "VG1"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char physvols_1[] = "/dev/sda2"; - physvols_1[5] = devchar; char *physvols[] = { physvols_0, physvols_1, @@ -11864,7 +12133,6 @@ static int test_vgcreate_0 (void) { char volgroup[] = "VG2"; char physvols_0[] = "/dev/sda3"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -11939,7 +12207,6 @@ static int test_pvcreate_0 (void) /* InitNone|InitEmpty for test_pvcreate_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -11960,10 +12227,9 @@ static int test_pvcreate_0 (void) if (r == -1) return -1; } - /* TestOutputList for pvcreate (0) */ + /* TestOutputListOfDevices for pvcreate (0) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -11981,7 +12247,6 @@ static int test_pvcreate_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11990,7 +12255,6 @@ static int test_pvcreate_0 (void) } { char device[] = "/dev/sda2"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -11999,7 +12263,6 @@ static int test_pvcreate_0 (void) } { char device[] = "/dev/sda3"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -12020,7 +12283,7 @@ static int test_pvcreate_0 (void) } { char expected[] = "/dev/sda1"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_pvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -12033,7 +12296,7 @@ static int test_pvcreate_0 (void) } { char expected[] = "/dev/sda2"; - expected[5] = devchar; + r[1][5] = 's'; if (strcmp (r[1], expected) != 0) { fprintf (stderr, "test_pvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[1]); return -1; @@ -12046,7 +12309,7 @@ static int test_pvcreate_0 (void) } { char expected[] = "/dev/sda3"; - expected[5] = devchar; + r[2][5] = 's'; if (strcmp (r[2], expected) != 0) { fprintf (stderr, "test_pvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[2]); return -1; @@ -12085,7 +12348,6 @@ static int test_is_dir_0 (void) /* InitBasicFS for test_is_dir_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12108,7 +12370,6 @@ static int test_is_dir_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12123,7 +12384,6 @@ static int test_is_dir_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12132,7 +12392,6 @@ static int test_is_dir_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12185,7 +12444,6 @@ static int test_is_dir_1 (void) /* InitBasicFS for test_is_dir_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12208,7 +12466,6 @@ static int test_is_dir_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12223,7 +12480,6 @@ static int test_is_dir_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12232,7 +12488,6 @@ static int test_is_dir_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12285,7 +12540,6 @@ static int test_is_file_0 (void) /* InitBasicFS for test_is_file_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12308,7 +12562,6 @@ static int test_is_file_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12323,7 +12576,6 @@ static int test_is_file_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12332,7 +12584,6 @@ static int test_is_file_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12385,7 +12636,6 @@ static int test_is_file_1 (void) /* InitBasicFS for test_is_file_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12408,7 +12658,6 @@ static int test_is_file_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12423,7 +12672,6 @@ static int test_is_file_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12432,7 +12680,6 @@ static int test_is_file_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12485,7 +12732,6 @@ static int test_exists_0 (void) /* InitBasicFS for test_exists_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12508,7 +12754,6 @@ static int test_exists_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12523,7 +12768,6 @@ static int test_exists_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12532,7 +12776,6 @@ static int test_exists_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12585,7 +12828,6 @@ static int test_exists_1 (void) /* InitBasicFS for test_exists_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12608,7 +12850,6 @@ static int test_exists_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12623,7 +12864,6 @@ static int test_exists_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12632,7 +12872,6 @@ static int test_exists_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12685,7 +12924,6 @@ static int test_mkdir_p_0 (void) /* InitBasicFS for test_mkdir_p_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12708,7 +12946,6 @@ static int test_mkdir_p_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12723,7 +12960,6 @@ static int test_mkdir_p_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12732,7 +12968,6 @@ static int test_mkdir_p_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12785,7 +13020,6 @@ static int test_mkdir_p_1 (void) /* InitBasicFS for test_mkdir_p_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12808,7 +13042,6 @@ static int test_mkdir_p_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12823,7 +13056,6 @@ static int test_mkdir_p_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12832,7 +13064,6 @@ static int test_mkdir_p_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12885,7 +13116,6 @@ static int test_mkdir_p_2 (void) /* InitBasicFS for test_mkdir_p_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -12908,7 +13138,6 @@ static int test_mkdir_p_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -12923,7 +13152,6 @@ static int test_mkdir_p_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -12932,7 +13160,6 @@ static int test_mkdir_p_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -12985,7 +13212,6 @@ static int test_mkdir_p_3 (void) /* InitBasicFS for test_mkdir_p_3: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13008,7 +13234,6 @@ static int test_mkdir_p_3 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13023,7 +13248,6 @@ static int test_mkdir_p_3 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13032,7 +13256,6 @@ static int test_mkdir_p_3 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13081,7 +13304,6 @@ static int test_mkdir_p_4 (void) /* InitBasicFS for test_mkdir_p_4: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13104,7 +13326,6 @@ static int test_mkdir_p_4 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13119,7 +13340,6 @@ static int test_mkdir_p_4 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13128,7 +13348,6 @@ static int test_mkdir_p_4 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13177,7 +13396,6 @@ static int test_mkdir_0 (void) /* InitBasicFS for test_mkdir_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13200,7 +13418,6 @@ static int test_mkdir_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13215,7 +13432,6 @@ static int test_mkdir_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13224,7 +13440,6 @@ static int test_mkdir_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13277,7 +13492,6 @@ static int test_mkdir_1 (void) /* InitBasicFS for test_mkdir_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13300,7 +13514,6 @@ static int test_mkdir_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13315,7 +13528,6 @@ static int test_mkdir_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13324,7 +13536,6 @@ static int test_mkdir_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13365,7 +13576,6 @@ static int test_rm_rf_0 (void) /* InitBasicFS for test_rm_rf_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13388,7 +13598,6 @@ static int test_rm_rf_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13403,7 +13612,6 @@ static int test_rm_rf_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13412,7 +13620,6 @@ static int test_rm_rf_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13489,7 +13696,6 @@ static int test_rmdir_0 (void) /* InitBasicFS for test_rmdir_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13512,7 +13718,6 @@ static int test_rmdir_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13527,7 +13732,6 @@ static int test_rmdir_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13536,7 +13740,6 @@ static int test_rmdir_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13585,7 +13788,6 @@ static int test_rmdir_1 (void) /* InitBasicFS for test_rmdir_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13608,7 +13810,6 @@ static int test_rmdir_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13623,7 +13824,6 @@ static int test_rmdir_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13632,7 +13832,6 @@ static int test_rmdir_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13673,7 +13872,6 @@ static int test_rmdir_2 (void) /* InitBasicFS for test_rmdir_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13696,7 +13894,6 @@ static int test_rmdir_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13711,7 +13908,6 @@ static int test_rmdir_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13720,7 +13916,6 @@ static int test_rmdir_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13769,7 +13964,6 @@ static int test_rm_0 (void) /* InitBasicFS for test_rm_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13792,7 +13986,6 @@ static int test_rm_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13807,7 +14000,6 @@ static int test_rm_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13816,7 +14008,6 @@ static int test_rm_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13865,7 +14056,6 @@ static int test_rm_1 (void) /* InitBasicFS for test_rm_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13888,7 +14078,6 @@ static int test_rm_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13903,7 +14092,6 @@ static int test_rm_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -13912,7 +14100,6 @@ static int test_rm_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -13953,7 +14140,6 @@ static int test_rm_2 (void) /* InitBasicFS for test_rm_2: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -13976,7 +14162,6 @@ static int test_rm_2 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -13991,7 +14176,6 @@ static int test_rm_2 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -14000,7 +14184,6 @@ static int test_rm_2 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -14049,7 +14232,6 @@ static int test_read_lines_0 (void) /* InitBasicFS for test_read_lines_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -14072,7 +14254,6 @@ static int test_read_lines_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -14087,7 +14268,6 @@ static int test_read_lines_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -14096,7 +14276,6 @@ static int test_read_lines_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -14191,7 +14370,6 @@ static int test_read_lines_1 (void) /* InitBasicFS for test_read_lines_1: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -14214,7 +14392,6 @@ static int test_read_lines_1 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -14229,7 +14406,6 @@ static int test_read_lines_1 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -14238,7 +14414,6 @@ static int test_read_lines_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -14297,7 +14472,6 @@ static int test_lvs_0 (void) /* InitBasicFSonLVM for test_lvs_0: create ext2 on /dev/VG/LV */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -14320,7 +14494,6 @@ static int test_lvs_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -14334,7 +14507,6 @@ static int test_lvs_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14344,7 +14516,6 @@ static int test_lvs_0 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -14435,7 +14606,6 @@ static int test_lvs_1 (void) /* InitNone|InitEmpty for test_lvs_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -14459,7 +14629,6 @@ static int test_lvs_1 (void) /* TestOutputList for lvs (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -14477,7 +14646,6 @@ static int test_lvs_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14486,7 +14654,6 @@ static int test_lvs_1 (void) } { char device[] = "/dev/sda2"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14495,7 +14662,6 @@ static int test_lvs_1 (void) } { char device[] = "/dev/sda3"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14505,9 +14671,7 @@ static int test_lvs_1 (void) { char volgroup[] = "VG1"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char physvols_1[] = "/dev/sda2"; - physvols_1[5] = devchar; char *physvols[] = { physvols_0, physvols_1, @@ -14522,7 +14686,6 @@ static int test_lvs_1 (void) { char volgroup[] = "VG2"; char physvols_0[] = "/dev/sda3"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -14636,7 +14799,6 @@ static int test_vgs_0 (void) /* InitBasicFSonLVM for test_vgs_0: create ext2 on /dev/VG/LV */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -14659,7 +14821,6 @@ static int test_vgs_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -14673,7 +14834,6 @@ static int test_vgs_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14683,7 +14843,6 @@ static int test_vgs_0 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -14774,7 +14933,6 @@ static int test_vgs_1 (void) /* InitNone|InitEmpty for test_vgs_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -14798,7 +14956,6 @@ static int test_vgs_1 (void) /* TestOutputList for vgs (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -14816,7 +14973,6 @@ static int test_vgs_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14825,7 +14981,6 @@ static int test_vgs_1 (void) } { char device[] = "/dev/sda2"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14834,7 +14989,6 @@ static int test_vgs_1 (void) } { char device[] = "/dev/sda3"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14844,9 +14998,7 @@ static int test_vgs_1 (void) { char volgroup[] = "VG1"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char physvols_1[] = "/dev/sda2"; - physvols_1[5] = devchar; char *physvols[] = { physvols_0, physvols_1, @@ -14861,7 +15013,6 @@ static int test_vgs_1 (void) { char volgroup[] = "VG2"; char physvols_0[] = "/dev/sda3"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -14936,7 +15087,6 @@ static int test_pvs_0 (void) /* InitBasicFSonLVM for test_pvs_0: create ext2 on /dev/VG/LV */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -14959,7 +15109,6 @@ static int test_pvs_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -14973,7 +15122,6 @@ static int test_pvs_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -14983,7 +15131,6 @@ static int test_pvs_0 (void) { char volgroup[] = "VG"; char physvols_0[] = "/dev/sda1"; - physvols_0[5] = devchar; char *physvols[] = { physvols_0, NULL @@ -15021,7 +15168,7 @@ static int test_pvs_0 (void) if (r == -1) return -1; } - /* TestOutputList for pvs (0) */ + /* TestOutputListOfDevices for pvs (0) */ { char **r; int i; @@ -15036,7 +15183,7 @@ static int test_pvs_0 (void) } { char expected[] = "/dev/sda1"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_pvs_0: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -15075,7 +15222,6 @@ static int test_pvs_1 (void) /* InitNone|InitEmpty for test_pvs_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15096,10 +15242,9 @@ static int test_pvs_1 (void) if (r == -1) return -1; } - /* TestOutputList for pvs (1) */ + /* TestOutputListOfDevices for pvs (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -15117,7 +15262,6 @@ static int test_pvs_1 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -15126,7 +15270,6 @@ static int test_pvs_1 (void) } { char device[] = "/dev/sda2"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -15135,7 +15278,6 @@ static int test_pvs_1 (void) } { char device[] = "/dev/sda3"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_pvcreate (g, device); @@ -15156,7 +15298,7 @@ static int test_pvs_1 (void) } { char expected[] = "/dev/sda1"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_pvs_1: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -15169,7 +15311,7 @@ static int test_pvs_1 (void) } { char expected[] = "/dev/sda2"; - expected[5] = devchar; + r[1][5] = 's'; if (strcmp (r[1], expected) != 0) { fprintf (stderr, "test_pvs_1: expected \"%s\" but got \"%s\"\n", expected, r[1]); return -1; @@ -15182,7 +15324,7 @@ static int test_pvs_1 (void) } { char expected[] = "/dev/sda3"; - expected[5] = devchar; + r[2][5] = 's'; if (strcmp (r[2], expected) != 0) { fprintf (stderr, "test_pvs_1: expected \"%s\" but got \"%s\"\n", expected, r[2]); return -1; @@ -15221,7 +15363,6 @@ static int test_list_partitions_0 (void) /* InitBasicFS for test_list_partitions_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15244,7 +15385,6 @@ static int test_list_partitions_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -15259,7 +15399,6 @@ static int test_list_partitions_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -15268,7 +15407,6 @@ static int test_list_partitions_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -15276,7 +15414,7 @@ static int test_list_partitions_0 (void) if (r == -1) return -1; } - /* TestOutputList for list_partitions (0) */ + /* TestOutputListOfDevices for list_partitions (0) */ { char **r; int i; @@ -15291,7 +15429,7 @@ static int test_list_partitions_0 (void) } { char expected[] = "/dev/sda1"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_list_partitions_0: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -15330,7 +15468,6 @@ static int test_list_partitions_1 (void) /* InitNone|InitEmpty for test_list_partitions_1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15351,10 +15488,9 @@ static int test_list_partitions_1 (void) if (r == -1) return -1; } - /* TestOutputList for list_partitions (1) */ + /* TestOutputListOfDevices for list_partitions (1) */ { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ",10"; char lines_1[] = ",20"; char lines_2[] = ","; @@ -15384,7 +15520,7 @@ static int test_list_partitions_1 (void) } { char expected[] = "/dev/sda1"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_list_partitions_1: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -15397,7 +15533,7 @@ static int test_list_partitions_1 (void) } { char expected[] = "/dev/sda2"; - expected[5] = devchar; + r[1][5] = 's'; if (strcmp (r[1], expected) != 0) { fprintf (stderr, "test_list_partitions_1: expected \"%s\" but got \"%s\"\n", expected, r[1]); return -1; @@ -15410,7 +15546,7 @@ static int test_list_partitions_1 (void) } { char expected[] = "/dev/sda3"; - expected[5] = devchar; + r[2][5] = 's'; if (strcmp (r[2], expected) != 0) { fprintf (stderr, "test_list_partitions_1: expected \"%s\" but got \"%s\"\n", expected, r[2]); return -1; @@ -15449,7 +15585,6 @@ static int test_list_devices_0 (void) /* InitNone|InitEmpty for test_list_devices_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15470,7 +15605,7 @@ static int test_list_devices_0 (void) if (r == -1) return -1; } - /* TestOutputList for list_devices (0) */ + /* TestOutputListOfDevices for list_devices (0) */ { char **r; int i; @@ -15485,7 +15620,7 @@ static int test_list_devices_0 (void) } { char expected[] = "/dev/sda"; - expected[5] = devchar; + r[0][5] = 's'; if (strcmp (r[0], expected) != 0) { fprintf (stderr, "test_list_devices_0: expected \"%s\" but got \"%s\"\n", expected, r[0]); return -1; @@ -15498,7 +15633,7 @@ static int test_list_devices_0 (void) } { char expected[] = "/dev/sdb"; - expected[5] = devchar; + r[1][5] = 's'; if (strcmp (r[1], expected) != 0) { fprintf (stderr, "test_list_devices_0: expected \"%s\" but got \"%s\"\n", expected, r[1]); return -1; @@ -15511,7 +15646,7 @@ static int test_list_devices_0 (void) } { char expected[] = "/dev/sdc"; - expected[5] = devchar; + r[2][5] = 's'; if (strcmp (r[2], expected) != 0) { fprintf (stderr, "test_list_devices_0: expected \"%s\" but got \"%s\"\n", expected, r[2]); return -1; @@ -15524,7 +15659,7 @@ static int test_list_devices_0 (void) } { char expected[] = "/dev/sdd"; - expected[5] = devchar; + r[3][5] = 's'; if (strcmp (r[3], expected) != 0) { fprintf (stderr, "test_list_devices_0: expected \"%s\" but got \"%s\"\n", expected, r[3]); return -1; @@ -15563,7 +15698,6 @@ static int test_ls_0 (void) /* InitBasicFS for test_ls_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15586,7 +15720,6 @@ static int test_ls_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -15601,7 +15734,6 @@ static int test_ls_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -15610,7 +15742,6 @@ static int test_ls_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -15732,7 +15863,6 @@ static int test_cat_0 (void) /* InitBasicFS for test_cat_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15755,7 +15885,6 @@ static int test_cat_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -15770,7 +15899,6 @@ static int test_cat_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -15779,7 +15907,6 @@ static int test_cat_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -15835,7 +15962,6 @@ static int test_touch_0 (void) /* InitBasicFS for test_touch_0: create ext2 on /dev/sda1 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15858,7 +15984,6 @@ static int test_touch_0 (void) } { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -15873,7 +15998,6 @@ static int test_touch_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -15882,7 +16006,6 @@ static int test_touch_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -15935,7 +16058,6 @@ static int test_sync_0 (void) /* InitNone|InitEmpty for test_sync_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -15988,7 +16110,6 @@ static int test_mount_0 (void) /* InitNone|InitEmpty for test_mount_0 */ { char device[] = "/dev/sda"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_blockdev_setrw (g, device); @@ -16013,7 +16134,6 @@ static int test_mount_0 (void) char expected[] = "new file contents"; { char device[] = "/dev/sda"; - device[5] = devchar; char lines_0[] = ","; char *lines[] = { lines_0, @@ -16028,7 +16148,6 @@ static int test_mount_0 (void) { char fstype[] = "ext2"; char device[] = "/dev/sda1"; - device[5] = devchar; int r; suppress_error = 0; r = guestfs_mkfs (g, fstype, device); @@ -16037,7 +16156,6 @@ static int test_mount_0 (void) } { char device[] = "/dev/sda1"; - device[5] = devchar; char mountpoint[] = "/"; int r; suppress_error = 0; @@ -16075,9 +16193,8 @@ int main (int argc, char *argv[]) char c = 0; int failed = 0; const char *filename; - int fd, i; + int fd; int nr_tests, test_num = 0; - char **devs; no_test_warnings (); @@ -16184,36 +16301,63 @@ int main (int argc, char *argv[]) printf ("guestfs_launch FAILED\n"); exit (1); } + + /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */ + alarm (600); + if (guestfs_wait_ready (g) == -1) { printf ("guestfs_wait_ready FAILED\n"); exit (1); } - /* Detect if the appliance uses /dev/sd* or /dev/hd* in device - * names. This changed between RHEL 5 and RHEL 6 so we have to - * support both. - */ - devs = guestfs_list_devices (g); - if (devs == NULL || devs[0] == NULL) { - printf ("guestfs_list_devices FAILED\n"); - exit (1); - } - if (strncmp (devs[0], "/dev/sd", 7) == 0) - devchar = 's'; - else if (strncmp (devs[0], "/dev/hd", 7) == 0) - devchar = 'h'; - else { - printf ("guestfs_list_devices returned unexpected string '%s'\n", - devs[0]); - exit (1); - } - for (i = 0; devs[i] != NULL; ++i) - free (devs[i]); - free (devs); + /* Cancel previous alarm. */ + alarm (0); - nr_tests = 144; + nr_tests = 151; test_num++; + printf ("%3d/%3d test_scrub_file_0\n", test_num, nr_tests); + if (test_scrub_file_0 () == -1) { + printf ("test_scrub_file_0 FAILED\n"); + failed++; + } + test_num++; + printf ("%3d/%3d test_scrub_device_0\n", test_num, nr_tests); + if (test_scrub_device_0 () == -1) { + printf ("test_scrub_device_0 FAILED\n"); + failed++; + } + test_num++; + printf ("%3d/%3d test_glob_expand_0\n", test_num, nr_tests); + if (test_glob_expand_0 () == -1) { + printf ("test_glob_expand_0 FAILED\n"); + failed++; + } + test_num++; + printf ("%3d/%3d test_glob_expand_1\n", test_num, nr_tests); + if (test_glob_expand_1 () == -1) { + printf ("test_glob_expand_1 FAILED\n"); + failed++; + } + test_num++; + printf ("%3d/%3d test_glob_expand_2\n", test_num, nr_tests); + if (test_glob_expand_2 () == -1) { + printf ("test_glob_expand_2 FAILED\n"); + failed++; + } + test_num++; + printf ("%3d/%3d test_ntfs_3g_probe_0\n", test_num, nr_tests); + if (test_ntfs_3g_probe_0 () == -1) { + printf ("test_ntfs_3g_probe_0 FAILED\n"); + failed++; + } + test_num++; + printf ("%3d/%3d test_ntfs_3g_probe_1\n", test_num, nr_tests); + if (test_ntfs_3g_probe_1 () == -1) { + printf ("test_ntfs_3g_probe_1 FAILED\n"); + failed++; + } + test_num++; printf ("%3d/%3d test_sleep_0\n", test_num, nr_tests); if (test_sleep_0 () == -1) { printf ("test_sleep_0 FAILED\n");