From: Karel Zak Date: Mon, 2 Sep 2019 10:57:11 +0000 (+0200) Subject: tests: (blkid) update regression tests (due to BLOCK_SIZE) X-Git-Tag: v2.35-rc1~244 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7d318a9dd63c9fae8f07754ce12aa9af4dce089;p=thirdparty%2Futil-linux.git tests: (blkid) update regression tests (due to BLOCK_SIZE) Signed-off-by: Karel Zak --- diff --git a/tests/expected/blkid/low-probe-befs b/tests/expected/blkid/low-probe-befs index b7f25cdd2f..5717049d29 100644 --- a/tests/expected/blkid/low-probe-befs +++ b/tests/expected/blkid/low-probe-befs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_LABEL=befs_test ID_FS_LABEL_ENC=befs_test ID_FS_TYPE=befs diff --git a/tests/expected/blkid/low-probe-exfat b/tests/expected/blkid/low-probe-exfat index b9defbdf90..59cb352254 100644 --- a/tests/expected/blkid/low-probe-exfat +++ b/tests/expected/blkid/low-probe-exfat @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=Новый_том ID_FS_LABEL_ENC=Новый\x20том ID_FS_TYPE=exfat diff --git a/tests/expected/blkid/low-probe-ext2 b/tests/expected/blkid/low-probe-ext2 index c70b856986..087da97a45 100644 --- a/tests/expected/blkid/low-probe-ext2 +++ b/tests/expected/blkid/low-probe-ext2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_LABEL=test-ext2 ID_FS_LABEL_ENC=test-ext2 ID_FS_TYPE=ext2 diff --git a/tests/expected/blkid/low-probe-ext3 b/tests/expected/blkid/low-probe-ext3 index 4bac43f57b..8684884c17 100644 --- a/tests/expected/blkid/low-probe-ext3 +++ b/tests/expected/blkid/low-probe-ext3 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_LABEL=test-ext3 ID_FS_LABEL_ENC=test-ext3 ID_FS_SEC_TYPE=ext2 diff --git a/tests/expected/blkid/low-probe-f2fs b/tests/expected/blkid/low-probe-f2fs index ee328640ed..272905125c 100644 --- a/tests/expected/blkid/low-probe-f2fs +++ b/tests/expected/blkid/low-probe-f2fs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=test-f2fs ID_FS_LABEL_ENC=test-f2fs ID_FS_TYPE=f2fs diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat index 9cc2da1287..a463cc987d 100644 --- a/tests/expected/blkid/low-probe-fat +++ b/tests/expected/blkid/low-probe-fat @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=TEST-FAT ID_FS_LABEL_ENC=TEST-FAT ID_FS_LABEL_FATBOOT=TEST-FAT diff --git a/tests/expected/blkid/low-probe-fat16_noheads b/tests/expected/blkid/low-probe-fat16_noheads index ba47078d24..ff9ef2e69a 100644 --- a/tests/expected/blkid/low-probe-fat16_noheads +++ b/tests/expected/blkid/low-probe-fat16_noheads @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=VTech_1070 ID_FS_LABEL_ENC=VTech\x201070 ID_FS_SEC_TYPE=msdos diff --git a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde index aa998f0858..ca49f200de 100644 --- a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde +++ b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=___ ID_FS_LABEL_ENC=\xe5\xe5\xe5 ID_FS_LABEL_FATBOOT=___ diff --git a/tests/expected/blkid/low-probe-fat32_label_64MB b/tests/expected/blkid/low-probe-fat32_label_64MB index 1179490cf9..4a99f8ff6c 100644 --- a/tests/expected/blkid/low-probe-fat32_label_64MB +++ b/tests/expected/blkid/low-probe-fat32_label_64MB @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=BINGO ID_FS_LABEL_ENC=BINGO ID_FS_TYPE=vfat diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 index c532983fa4..5d1771de32 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=label1 ID_FS_LABEL_ENC=label1 ID_FS_LABEL_FATBOOT=label1 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 index 7860cd1599..c13af90214 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=NO_NAME ID_FS_LABEL_ENC=NO\x20NAME ID_FS_TYPE=vfat diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty index 9defdcfa6b..73c553e543 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=92B4-BA66 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 index 437a01b612..4b8146208a 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=label2 ID_FS_LABEL_ENC=label2 ID_FS_LABEL_FATBOOT=label2 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 index 7860cd1599..c13af90214 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=NO_NAME ID_FS_LABEL_ENC=NO\x20NAME ID_FS_TYPE=vfat diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase index 9defdcfa6b..73c553e543 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=92B4-BA66 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase index 09299da681..075278de4d 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL_FATBOOT=label1 ID_FS_LABEL_FATBOOT_ENC=label1 ID_FS_TYPE=vfat diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 index a0bb728d30..fe4884d286 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LABEL2 ID_FS_LABEL_ENC=LABEL2 ID_FS_LABEL_FATBOOT=label1 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none b/tests/expected/blkid/low-probe-fat32_mkdosfs_none index 7292f075f2..5475176163 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=E6B8-AF8C 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 index 7292f075f2..5475176163 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=E6B8-AF8C diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 index 4ec217fb4a..dfacd9b6aa 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL_FATBOOT=label1 ID_FS_LABEL_FATBOOT_ENC=label1 ID_FS_TYPE=vfat 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 index 046769b79b..142259c876 100644 --- 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 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LABEL2 ID_FS_LABEL_ENC=LABEL2 ID_FS_LABEL_FATBOOT=label1 diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 index 65a5bfd151..d1360ada06 100644 --- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 +++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LABEL1 ID_FS_LABEL_ENC=LABEL1 ID_FS_TYPE=vfat 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 index 4eccd8afb2..c078359c6d 100644 --- 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 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=label2 ID_FS_LABEL_ENC=label2 ID_FS_LABEL_FATBOOT=label2 diff --git a/tests/expected/blkid/low-probe-fat32_xp_label1 b/tests/expected/blkid/low-probe-fat32_xp_label1 index 8e521ebbb6..8a27d7e1c2 100644 --- a/tests/expected/blkid/low-probe-fat32_xp_label1 +++ b/tests/expected/blkid/low-probe-fat32_xp_label1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LABEL1 ID_FS_LABEL_ENC=LABEL1 ID_FS_TYPE=vfat diff --git a/tests/expected/blkid/low-probe-fat32_xp_none b/tests/expected/blkid/low-probe-fat32_xp_none index 5db25f8c03..f8271c2b70 100644 --- a/tests/expected/blkid/low-probe-fat32_xp_none +++ b/tests/expected/blkid/low-probe-fat32_xp_none @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=54B6-DC94 diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 index 9c5a1b2509..fdc5eb6f6b 100644 --- a/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 +++ b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL_FATBOOT=label1 ID_FS_LABEL_FATBOOT_ENC=label1 ID_FS_TYPE=vfat diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 index fe9ba14464..74f271519e 100644 --- a/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 +++ b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LABEL1 ID_FS_LABEL_ENC=LABEL1 ID_FS_LABEL_FATBOOT=LABEL1 diff --git a/tests/expected/blkid/low-probe-gfs2 b/tests/expected/blkid/low-probe-gfs2 index cd5a664b4f..f04529bc0d 100644 --- a/tests/expected/blkid/low-probe-gfs2 +++ b/tests/expected/blkid/low-probe-gfs2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=mycluster:mygfs2 ID_FS_LABEL_ENC=mycluster:mygfs2 ID_FS_TYPE=gfs2 diff --git a/tests/expected/blkid/low-probe-hfsplus b/tests/expected/blkid/low-probe-hfsplus index f54b59f11e..cc351a0420 100644 --- a/tests/expected/blkid/low-probe-hfsplus +++ b/tests/expected/blkid/low-probe-hfsplus @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=123456789ABCDE ID_FS_LABEL_ENC=123456789ABCDE ID_FS_TYPE=hfsplus diff --git a/tests/expected/blkid/low-probe-hpfs b/tests/expected/blkid/low-probe-hpfs index 47ae1af281..7e4a12b977 100644 --- a/tests/expected/blkid/low-probe-hpfs +++ b/tests/expected/blkid/low-probe-hpfs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=P01_S16A ID_FS_LABEL_ENC=P01\x20S16A ID_FS_TYPE=hpfs diff --git a/tests/expected/blkid/low-probe-iso b/tests/expected/blkid/low-probe-iso index af9908aaaf..082f0742a3 100644 --- a/tests/expected/blkid/low-probe-iso +++ b/tests/expected/blkid/low-probe-iso @@ -1,4 +1,5 @@ ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=IsoVolumeName ID_FS_LABEL_ENC=IsoVolumeName ID_FS_SYSTEM_ID=LINUX diff --git a/tests/expected/blkid/low-probe-iso-joliet b/tests/expected/blkid/low-probe-iso-joliet index 0229a0d2c7..06f529d03b 100644 --- a/tests/expected/blkid/low-probe-iso-joliet +++ b/tests/expected/blkid/low-probe-iso-joliet @@ -1,4 +1,5 @@ ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=ThisWonderfulLabelIsVeryVeryLong ID_FS_LABEL_ENC=ThisWonderfulLabelIsVeryVeryLong ID_FS_SYSTEM_ID=LINUX diff --git a/tests/expected/blkid/low-probe-iso-rr-joliet b/tests/expected/blkid/low-probe-iso-rr-joliet index 14d550e907..bb3274db3a 100644 --- a/tests/expected/blkid/low-probe-iso-rr-joliet +++ b/tests/expected/blkid/low-probe-iso-rr-joliet @@ -1,4 +1,5 @@ ID_FS_APPLICATION_ID=GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=ThisIsVolumeName ID_FS_LABEL_ENC=ThisIsVolumeName ID_FS_SYSTEM_ID=LINUX diff --git a/tests/expected/blkid/low-probe-jbd b/tests/expected/blkid/low-probe-jbd index 8dbcdbce0c..c9f9f6b79a 100644 --- a/tests/expected/blkid/low-probe-jbd +++ b/tests/expected/blkid/low-probe-jbd @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_LOGUUID=0d7a07df-7b06-4829-bce7-3b9c3ece570c ID_FS_TYPE=jbd ID_FS_USAGE=other diff --git a/tests/expected/blkid/low-probe-jfs b/tests/expected/blkid/low-probe-jfs index 877fd168e4..ac7d31baca 100644 --- a/tests/expected/blkid/low-probe-jfs +++ b/tests/expected/blkid/low-probe-jfs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=test-jfs ID_FS_LABEL_ENC=test-jfs ID_FS_TYPE=jfs diff --git a/tests/expected/blkid/low-probe-minix-BE b/tests/expected/blkid/low-probe-minix-BE index 9627799a37..f73f1b5db5 100644 --- a/tests/expected/blkid/low-probe-minix-BE +++ b/tests/expected/blkid/low-probe-minix-BE @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_TYPE=minix ID_FS_USAGE=filesystem ID_FS_VERSION=1 diff --git a/tests/expected/blkid/low-probe-minix-LE b/tests/expected/blkid/low-probe-minix-LE index 9627799a37..f73f1b5db5 100644 --- a/tests/expected/blkid/low-probe-minix-LE +++ b/tests/expected/blkid/low-probe-minix-LE @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_TYPE=minix ID_FS_USAGE=filesystem ID_FS_VERSION=1 diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2 index c6c9cab176..ff27e0b237 100644 --- a/tests/expected/blkid/low-probe-nilfs2 +++ b/tests/expected/blkid/low-probe-nilfs2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=test-nilfs2 ID_FS_LABEL_ENC=test-nilfs2 ID_FS_TYPE=nilfs2 diff --git a/tests/expected/blkid/low-probe-ntfs b/tests/expected/blkid/low-probe-ntfs index aaaa077da0..790157aaa0 100644 --- a/tests/expected/blkid/low-probe-ntfs +++ b/tests/expected/blkid/low-probe-ntfs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=Новый_том ID_FS_LABEL_ENC=Новый\x20том ID_FS_TYPE=ntfs diff --git a/tests/expected/blkid/low-probe-ocfs2 b/tests/expected/blkid/low-probe-ocfs2 index 2328d21a0a..9b84dbe67d 100644 --- a/tests/expected/blkid/low-probe-ocfs2 +++ b/tests/expected/blkid/low-probe-ocfs2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_LABEL=test-ocfs2 ID_FS_LABEL_ENC=test-ocfs2 ID_FS_TYPE=ocfs2 diff --git a/tests/expected/blkid/low-probe-reiser3 b/tests/expected/blkid/low-probe-reiser3 index d376ecae17..1c4b1478dc 100644 --- a/tests/expected/blkid/low-probe-reiser3 +++ b/tests/expected/blkid/low-probe-reiser3 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=TESTREISER ID_FS_LABEL_ENC=TESTREISER ID_FS_TYPE=reiserfs diff --git a/tests/expected/blkid/low-probe-reiser4 b/tests/expected/blkid/low-probe-reiser4 index 65d63aa658..66df064fd3 100644 --- a/tests/expected/blkid/low-probe-reiser4 +++ b/tests/expected/blkid/low-probe-reiser4 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=TESTR4 ID_FS_LABEL_ENC=TESTR4 ID_FS_TYPE=reiser4 diff --git a/tests/expected/blkid/low-probe-romfs b/tests/expected/blkid/low-probe-romfs index 2eb982bc14..b56a6b8814 100644 --- a/tests/expected/blkid/low-probe-romfs +++ b/tests/expected/blkid/low-probe-romfs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_LABEL=test-romfs ID_FS_LABEL_ENC=test-romfs ID_FS_TYPE=romfs diff --git a/tests/expected/blkid/low-probe-small-fat32 b/tests/expected/blkid/low-probe-small-fat32 index a0746ced45..d9c63c7102 100644 --- a/tests/expected/blkid/low-probe-small-fat32 +++ b/tests/expected/blkid/low-probe-small-fat32 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=TESTVFAT ID_FS_LABEL_ENC=TESTVFAT ID_FS_LABEL_FATBOOT=TESTVFAT diff --git a/tests/expected/blkid/low-probe-udf b/tests/expected/blkid/low-probe-udf index 902fb82f06..869a335db5 100644 --- a/tests/expected/blkid/low-probe-udf +++ b/tests/expected/blkid/low-probe-udf @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=test-udf ID_FS_LABEL_ENC=test-udf ID_FS_LOGICAL_VOLUME_ID=test-udf diff --git a/tests/expected/blkid/low-probe-udf-bdr-2.60-nero b/tests/expected/blkid/low-probe-udf-bdr-2.60-nero index c0b8867b53..fcf29b112a 100644 --- a/tests/expected/blkid/low-probe-udf-bdr-2.60-nero +++ b/tests/expected/blkid/low-probe-udf-bdr-2.60-nero @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label diff --git a/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208 b/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208 index f57dee08bf..768d0d2f0f 100644 --- a/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208 +++ b/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=Volume_Label ID_FS_LABEL_ENC=Volume\x20Label ID_FS_LOGICAL_VOLUME_ID=Volume Label diff --git a/tests/expected/blkid/low-probe-udf-cd-nero-6 b/tests/expected/blkid/low-probe-udf-cd-nero-6 index cf85ea9c55..41f9ff5095 100644 --- a/tests/expected/blkid/low-probe-udf-cd-nero-6 +++ b/tests/expected/blkid/low-probe-udf-cd-nero-6 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=UDF_Label ID_FS_LABEL_ENC=UDF\x20Label ID_FS_LOGICAL_VOLUME_ID=UDF Label diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 index 5446aec423..e26b2da0c1 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LinuxUDF ID_FS_LABEL_ENC=LinuxUDF ID_FS_LOGICAL_VOLUME_ID=LinuxUDF diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 index b72fcac72d..112768353d 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 index 20f1485491..db9127d341 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 index 34a2f49e34..f472284f33 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 index 3fef2b3c65..6f4802ca0d 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=2048 ID_FS_LABEL=ÿ ID_FS_LABEL_ENC=ÿ ID_FS_LOGICAL_VOLUME_ID=ÿ diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 index 28cd73603a..0ae5b910ee 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=1024 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 index d84ae8964a..1b98c21eda 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=Label ID_FS_LABEL_ENC=Label ID_FS_LOGICAL_VOLUME_ID=Label diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 index d73914970f..c22c96b0a1 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ID_FS_LABEL_ENC=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ID_FS_LOGICAL_VOLUME_ID=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 index a78606eea1..c3b9d8a8af 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=4096 ID_FS_LABEL=Label4096 ID_FS_LABEL_ENC=Label4096 ID_FS_LOGICAL_VOLUME_ID=Label4096 diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 index 448c8f90ba..58c131f7d1 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 +++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=LinuxUDF ID_FS_LABEL_ENC=LinuxUDF ID_FS_LOGICAL_VOLUME_ID=LinuxUDF diff --git a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5 b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5 index b33c814d65..18930ceadf 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5 +++ b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=discname ID_FS_LABEL_ENC=discname ID_FS_LOGICAL_VOLUME_ID=discname diff --git a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7 b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7 index a47bd3f12e..13e9841672 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7 +++ b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=discname ID_FS_LABEL_ENC=discname ID_FS_LOGICAL_VOLUME_ID=discname diff --git a/tests/expected/blkid/low-probe-udf-hdd-win7 b/tests/expected/blkid/low-probe-udf-hdd-win7 index 759c8db3d7..e68f180e5a 100644 --- a/tests/expected/blkid/low-probe-udf-hdd-win7 +++ b/tests/expected/blkid/low-probe-udf-hdd-win7 @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=My_volume_label ID_FS_LABEL_ENC=My\x20volume\x20label ID_FS_LOGICAL_VOLUME_ID=My volume label diff --git a/tests/expected/blkid/low-probe-ufs b/tests/expected/blkid/low-probe-ufs index 96828d73ed..256f065d29 100644 --- a/tests/expected/blkid/low-probe-ufs +++ b/tests/expected/blkid/low-probe-ufs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=2048 ID_FS_TYPE=ufs ID_FS_USAGE=filesystem ID_FS_UUID=4b0e640aec56ac70 diff --git a/tests/expected/blkid/low-probe-xfs b/tests/expected/blkid/low-probe-xfs index f21d881a5a..6eb1b4600b 100644 --- a/tests/expected/blkid/low-probe-xfs +++ b/tests/expected/blkid/low-probe-xfs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=test-xfs ID_FS_LABEL_ENC=test-xfs ID_FS_TYPE=xfs diff --git a/tests/expected/blkid/low-probe-zfs b/tests/expected/blkid/low-probe-zfs index 952e0e591a..0e7af28666 100644 --- a/tests/expected/blkid/low-probe-zfs +++ b/tests/expected/blkid/low-probe-zfs @@ -1,3 +1,4 @@ +ID_FS_BLOCK_SIZE=512 ID_FS_LABEL=tank ID_FS_LABEL_ENC=tank ID_FS_TYPE=zfs_member