From: Pali Rohár Date: Sat, 25 Nov 2017 11:49:27 +0000 (+0100) Subject: tests: Add tests for FAT32 labels X-Git-Tag: v2.33-rc1~345^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6687cfded9cafb73506087c6382b5c5d64a6953c;p=thirdparty%2Futil-linux.git tests: Add tests for FAT32 labels These FAT32 images were generated for FAT label test suite in October 2017. Now blkid reports same FAT32 label as MS-DOS 6, 7 and Windows 98, XP, 10. For more information about test result see email: https://www.spinics.net/lists/kernel/msg2640891.html Signed-off-by: Pali Rohár --- diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat index 420121117f..9cc2da1287 100644 --- a/tests/expected/blkid/low-probe-fat +++ b/tests/expected/blkid/low-probe-fat @@ -1,5 +1,7 @@ ID_FS_LABEL=TEST-FAT ID_FS_LABEL_ENC=TEST-FAT +ID_FS_LABEL_FATBOOT=TEST-FAT +ID_FS_LABEL_FATBOOT_ENC=TEST-FAT ID_FS_SEC_TYPE=msdos ID_FS_TYPE=vfat ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde index 096bcbf2c1..aa998f0858 100644 --- a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde +++ b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde @@ -1,5 +1,7 @@ ID_FS_LABEL=___ ID_FS_LABEL_ENC=\xe5\xe5\xe5 +ID_FS_LABEL_FATBOOT=___ +ID_FS_LABEL_FATBOOT_ENC=\xe5\xe5\xe5 ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=2826-F9B3 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 new file mode 100644 index 0000000000..c532983fa4 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 @@ -0,0 +1,9 @@ +ID_FS_LABEL=label1 +ID_FS_LABEL_ENC=label1 +ID_FS_LABEL_FATBOOT=label1 +ID_FS_LABEL_FATBOOT_ENC=label1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME new file mode 100644 index 0000000000..7860cd1599 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME @@ -0,0 +1,7 @@ +ID_FS_LABEL=NO_NAME +ID_FS_LABEL_ENC=NO\x20NAME +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty new file mode 100644 index 0000000000..9defdcfa6b --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty @@ -0,0 +1,5 @@ +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 new file mode 100644 index 0000000000..437a01b612 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 @@ -0,0 +1,9 @@ +ID_FS_LABEL=label2 +ID_FS_LABEL_ENC=label2 +ID_FS_LABEL_FATBOOT=label2 +ID_FS_LABEL_FATBOOT_ENC=label2 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME new file mode 100644 index 0000000000..7860cd1599 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME @@ -0,0 +1,7 @@ +ID_FS_LABEL=NO_NAME +ID_FS_LABEL_ENC=NO\x20NAME +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase new file mode 100644 index 0000000000..9defdcfa6b --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase @@ -0,0 +1,5 @@ +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase new file mode 100644 index 0000000000..09299da681 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase @@ -0,0 +1,7 @@ +ID_FS_LABEL_FATBOOT=label1 +ID_FS_LABEL_FATBOOT_ENC=label1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 new file mode 100644 index 0000000000..a0bb728d30 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 @@ -0,0 +1,9 @@ +ID_FS_LABEL=LABEL2 +ID_FS_LABEL_ENC=LABEL2 +ID_FS_LABEL_FATBOOT=label1 +ID_FS_LABEL_FATBOOT_ENC=label1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=92B4-BA66 +ID_FS_UUID_ENC=92B4-BA66 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none b/tests/expected/blkid/low-probe-fat32_mkdosfs_none new file mode 100644 index 0000000000..7292f075f2 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none @@ -0,0 +1,5 @@ +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=E6B8-AF8C +ID_FS_UUID_ENC=E6B8-AF8C +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME new file mode 100644 index 0000000000..7292f075f2 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME @@ -0,0 +1,5 @@ +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=E6B8-AF8C +ID_FS_UUID_ENC=E6B8-AF8C +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 new file mode 100644 index 0000000000..4ec217fb4a --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 @@ -0,0 +1,7 @@ +ID_FS_LABEL_FATBOOT=label1 +ID_FS_LABEL_FATBOOT_ENC=label1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=E6B8-AF8C +ID_FS_UUID_ENC=E6B8-AF8C +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2 new file mode 100644 index 0000000000..046769b79b --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2 @@ -0,0 +1,9 @@ +ID_FS_LABEL=LABEL2 +ID_FS_LABEL_ENC=LABEL2 +ID_FS_LABEL_FATBOOT=label1 +ID_FS_LABEL_FATBOOT_ENC=label1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=E6B8-AF8C +ID_FS_UUID_ENC=E6B8-AF8C +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 new file mode 100644 index 0000000000..65a5bfd151 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 @@ -0,0 +1,7 @@ +ID_FS_LABEL=LABEL1 +ID_FS_LABEL_ENC=LABEL1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=E6B8-AF8C +ID_FS_UUID_ENC=E6B8-AF8C +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2 new file mode 100644 index 0000000000..4eccd8afb2 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2 @@ -0,0 +1,9 @@ +ID_FS_LABEL=label2 +ID_FS_LABEL_ENC=label2 +ID_FS_LABEL_FATBOOT=label2 +ID_FS_LABEL_FATBOOT_ENC=label2 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=E6B8-AF8C +ID_FS_UUID_ENC=E6B8-AF8C +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_xp_label1 b/tests/expected/blkid/low-probe-fat32_xp_label1 new file mode 100644 index 0000000000..8e521ebbb6 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_xp_label1 @@ -0,0 +1,7 @@ +ID_FS_LABEL=LABEL1 +ID_FS_LABEL_ENC=LABEL1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=A420-9304 +ID_FS_UUID_ENC=A420-9304 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_xp_none b/tests/expected/blkid/low-probe-fat32_xp_none new file mode 100644 index 0000000000..5db25f8c03 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_xp_none @@ -0,0 +1,5 @@ +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=54B6-DC94 +ID_FS_UUID_ENC=54B6-DC94 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 new file mode 100644 index 0000000000..9c5a1b2509 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 @@ -0,0 +1,7 @@ +ID_FS_LABEL_FATBOOT=label1 +ID_FS_LABEL_FATBOOT_ENC=label1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=54B6-DC94 +ID_FS_UUID_ENC=54B6-DC94 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 new file mode 100644 index 0000000000..fe9ba14464 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 @@ -0,0 +1,9 @@ +ID_FS_LABEL=LABEL1 +ID_FS_LABEL_ENC=LABEL1 +ID_FS_LABEL_FATBOOT=LABEL1 +ID_FS_LABEL_FATBOOT_ENC=LABEL1 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=54B6-DC94 +ID_FS_UUID_ENC=54B6-DC94 +ID_FS_VERSION=FAT32 diff --git a/tests/expected/blkid/low-probe-small-fat32 b/tests/expected/blkid/low-probe-small-fat32 index 39239e6b3e..a0746ced45 100644 --- a/tests/expected/blkid/low-probe-small-fat32 +++ b/tests/expected/blkid/low-probe-small-fat32 @@ -1,5 +1,7 @@ ID_FS_LABEL=TESTVFAT ID_FS_LABEL_ENC=TESTVFAT +ID_FS_LABEL_FATBOOT=TESTVFAT +ID_FS_LABEL_FATBOOT_ENC=TESTVFAT ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=1423-AAE1 diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1.img.xz new file mode 100644 index 0000000000..4df4b1da68 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_NO_NAME.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_NO_NAME.img.xz new file mode 100644 index 0000000000..932ab11cb9 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_NO_NAME.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_empty.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_empty.img.xz new file mode 100644 index 0000000000..3027031839 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_empty.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_label2.img.xz new file mode 100644 index 0000000000..1551e11039 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_label2.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_NO_NAME.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_NO_NAME.img.xz new file mode 100644 index 0000000000..264c440c50 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_NO_NAME.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_erase.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_erase.img.xz new file mode 100644 index 0000000000..f0a95716c9 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_erase.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_erase.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_erase.img.xz new file mode 100644 index 0000000000..cc4280eef6 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_erase.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_label2.img.xz new file mode 100644 index 0000000000..66d4838135 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_label2.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none.img.xz new file mode 100644 index 0000000000..0d084f3451 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_none.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_NO_NAME.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_NO_NAME.img.xz new file mode 100644 index 0000000000..a238a01d64 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_NO_NAME.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1.img.xz new file mode 100644 index 0000000000..14860319a6 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1_xp_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1_xp_label2.img.xz new file mode 100644 index 0000000000..5401e1f93f Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1_xp_label2.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1.img.xz new file mode 100644 index 0000000000..acf01ccb33 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1_dosfslabel_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1_dosfslabel_label2.img.xz new file mode 100644 index 0000000000..bff0971d52 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1_dosfslabel_label2.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_xp_label1.img.xz b/tests/ts/blkid/images-fs/fat32_xp_label1.img.xz new file mode 100644 index 0000000000..97d71e9f28 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_xp_label1.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_xp_none.img.xz b/tests/ts/blkid/images-fs/fat32_xp_none.img.xz new file mode 100644 index 0000000000..a8c819ed74 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_xp_none.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_xp_none_dosfslabel_label1.img.xz b/tests/ts/blkid/images-fs/fat32_xp_none_dosfslabel_label1.img.xz new file mode 100644 index 0000000000..0ebe6beca5 Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_xp_none_dosfslabel_label1.img.xz differ diff --git a/tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xz b/tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xz new file mode 100644 index 0000000000..5a7a77403e Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xz differ