From b0be99a9e9bf33117ae32680d99586d890401405 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Mon, 2 Jan 2023 02:26:56 +0000 Subject: [PATCH] Make all the test hdd images use MBR instead of GPT Well, it's just easier to generate MBR because GPT requires a few sectors at the very end of a disk. A separate test for GPT should be written: with tens of partitions and so on. --- TODO | 3 ++- img/makefile | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/TODO b/TODO index 3ec265e..00f29e0 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,6 @@ multithreaded: kofu one.t two.t make mkfs.xfs use config file via -c option +tests for ext* and fat* +writing tests compare with reference XFS implementation stressing via ref impl - diff --git a/img/makefile b/img/makefile index 7d8371a..fb75a77 100644 --- a/img/makefile +++ b/img/makefile @@ -35,7 +35,7 @@ jfs.img: fallocate -l 16MiB $@ mkfs.jfs -q $@ fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_lookup_v4.img: @@ -71,7 +71,7 @@ xfs_lookup_v4.img: sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ parted --script --align optimal $@ mktable msdos - parted --script --align optimal $@ mkpart primary xfs 1MiB 100% + parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_lookup_v5.img: fallocate -l 10GiB $@ @@ -106,7 +106,7 @@ xfs_lookup_v5.img: sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ parted --script --align optimal $@ mktable msdos - parted --script --align optimal $@ mkpart primary xfs 1MiB 100% + parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_nrext64.img: fallocate -l 3000MiB $@ @@ -135,7 +135,7 @@ xfs_nrext64.img: sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ parted --script --align optimal $@ mktable msdos - parted --script --align optimal $@ mkpart primary xfs 1MiB 100% + parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_bigtime.img: fallocate -l $(XFS_MIN_PART_SIZE) $@ @@ -165,13 +165,13 @@ xfs_bigtime.img: sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ parted --script --align optimal $@ mktable msdos - parted --script --align optimal $@ mkpart primary xfs 1MiB 100% + parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_borg_bit.img: fallocate -l $(XFS_MIN_PART_SIZE) $@ mkfs.xfs -n version=ci $@ fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_short_dir_i8.img: @@ -189,7 +189,7 @@ xfs_short_dir_i8.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt # FIXME: all msdos + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_ftype0_s05k_b2k_n8k.img: @@ -220,7 +220,7 @@ xfs_v4_ftype0_s05k_b2k_n8k.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_ftype1_s05k_b2k_n8k.img: @@ -251,7 +251,7 @@ xfs_v4_ftype1_s05k_b2k_n8k.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_xattr.img: @@ -274,7 +274,7 @@ xfs_v4_xattr.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_btrees_l2.img: @@ -295,7 +295,7 @@ xfs_v4_btrees_l2.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_files_s05k_b4k_n8k.img: @@ -330,7 +330,7 @@ xfs_v4_files_s05k_b4k_n8k.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_ftype0_s4k_b4k_n8k.img: @@ -362,10 +362,10 @@ xfs_v4_ftype0_s4k_b4k_n8k.img: sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ sudo losetup -b 4096 /dev/loop8 $@ - sudo parted --script /dev/loop8 mktable gpt + sudo parted --script /dev/loop8 mktable msdos sudo parted --script --align optimal /dev/loop8 mkpart primary 1MiB 100% sudo losetup -d /dev/loop8 -# parted --script $@ mktable gpt +# parted --script $@ mktable msdos # parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_ftype0_s05k_b2k_n8k_xattr.img: @@ -403,7 +403,7 @@ xfs_v4_ftype0_s05k_b2k_n8k_xattr.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v4_unicode.img: @@ -428,7 +428,7 @@ xfs_v4_unicode.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v5_ftype1_s05k_b2k_n8k.img: @@ -459,7 +459,7 @@ xfs_v5_ftype1_s05k_b2k_n8k.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% xfs_v5_files_s05k_b4k_n8k.img: @@ -488,7 +488,7 @@ xfs_v5_files_s05k_b4k_n8k.img: # sudo umount $(TEMP_DIR) fallocate -i -o 0 -l 1MiB $@ - parted --script $@ mktable gpt + parted --script $@ mktable msdos parted --script --align optimal $@ mkpart primary 1MiB 100% fat32_test0.img: