diff options
| author | Karel Zak | 2018-03-27 12:54:53 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-03-27 12:54:53 +0200 |
| commit | 04060bc3f12b8b37799474cac93deb9d47258e7b (patch) | |
| tree | c1aaa78ae2e01bb71291c72e067d291c99f6966b /tests/expected/blkid | |
| parent | tests: update column(1) space-separator test (diff) | |
| parent | tests: Add tests for FAT32 labels (diff) | |
| download | kernel-qcow2-util-linux-04060bc3f12b8b37799474cac93deb9d47258e7b.tar.gz kernel-qcow2-util-linux-04060bc3f12b8b37799474cac93deb9d47258e7b.tar.xz kernel-qcow2-util-linux-04060bc3f12b8b37799474cac93deb9d47258e7b.zip | |
Merge branch 'master' of https://github.com/pali/util-linux
* 'master' of https://github.com/pali/util-linux:
tests: Add tests for FAT32 labels
blkid: Encode any field which starts with LABEL in same way as LABEL field
libblkid: vfat: Change parsing label in special cases
Diffstat (limited to 'tests/expected/blkid')
21 files changed, 134 insertions, 0 deletions
diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat index 420121117..9cc2da128 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 096bcbf2c..aa998f085 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 000000000..c532983fa --- /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 000000000..7860cd159 --- /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 000000000..9defdcfa6 --- /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 000000000..437a01b61 --- /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 000000000..7860cd159 --- /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 000000000..9defdcfa6 --- /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 000000000..09299da68 --- /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 000000000..a0bb728d3 --- /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 000000000..7292f075f --- /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 000000000..7292f075f --- /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 000000000..4ec217fb4 --- /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 000000000..046769b79 --- /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 000000000..65a5bfd15 --- /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 000000000..4eccd8afb --- /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 000000000..8e521ebbb --- /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 000000000..5db25f8c0 --- /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 000000000..9c5a1b250 --- /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 000000000..fe9ba1446 --- /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 39239e6b3..a0746ced4 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 |