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 <pali.rohar@gmail.com>

diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat
index 420121117f0188fd53fd91367e11cff98f0fa880..9cc2da1287f4e307718d35083c53832a85a35763 100644 (file)
--- 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 096bcbf2c18d084635244c9737f84150fec0bc8f..aa998f08583974f30cb600e7571e544dc4c72585 100644 (file)
--- 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 (file)
index 0000000..c532983
--- /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 (file)
index 0000000..7860cd1
--- /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 (file)
index 0000000..9defdcf
--- /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 (file)
index 0000000..437a01b
--- /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 (file)
index 0000000..7860cd1
--- /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 (file)
index 0000000..9defdcf
--- /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 (file)
index 0000000..09299da
--- /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 (file)
index 0000000..a0bb728
--- /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 (file)
index 0000000..7292f07
--- /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 (file)
index 0000000..7292f07
--- /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 (file)
index 0000000..4ec217f
--- /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 (file)
index 0000000..046769b
--- /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 (file)
index 0000000..65a5bfd
--- /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 (file)
index 0000000..4eccd8a
--- /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 (file)
index 0000000..8e521eb
--- /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 (file)
index 0000000..5db25f8
--- /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 (file)
index 0000000..9c5a1b2
--- /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 (file)
index 0000000..fe9ba14
--- /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 39239e6b3efc9ce57eacad38de23a36521ddd286..a0746ced452b1288120ac7d60220001e65a91ee5 100644 (file)
--- 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 (file)
index 0000000..4df4b1d
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 (file)
index 0000000..932ab11
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 (file)
index 0000000..3027031
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 (file)
index 0000000..1551e11
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 (file)
index 0000000..264c440
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 (file)
index 0000000..f0a9571
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 (file)
index 0000000..cc4280e
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 (file)
index 0000000..66d4838
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 (file)
index 0000000..0d084f3
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 (file)
index 0000000..a238a01
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 (file)
index 0000000..1486031
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 (file)
index 0000000..5401e1f
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 (file)
index 0000000..acf01cc
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 (file)
index 0000000..bff0971
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 (file)
index 0000000..97d71e9
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 (file)
index 0000000..a8c819e
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 (file)
index 0000000..0ebe6be
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 (file)
index 0000000..5a7a774
Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xz differ