From: Pali Rohár Date: Thu, 10 Dec 2020 01:38:06 +0000 (+0100) Subject: libblkid: iso9660: add new test images X-Git-Tag: v2.37-rc1~230 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb6a4cc2e1e28f5e297378fb384e297dd238f7e2;p=thirdparty%2Futil-linux.git libblkid: iso9660: add new test images Image iso-different-iso-joliet-label contains different identifiers in ISO and Joliet locations. Identifiers are prefixed with "ISO" or "Joliet" string to verify that UNICODE Joliet has preference over ASCII ISO. Image iso-unicode-long-label contains very long identifiers in ISO location which do not fit into the Joliet location. In ISO location is UNICODE character 'ï' replaced by '_' and unrepresentable spaces also by '_'. This test verifies that libblkid can use first half of identifiers from Joliet (which contains UNICODE) and second half from ISO which is just uppercase and only small subset of ASCII. This image was generated by Nero Linux software and basically this truncate and '_' replacement is done by default for any long or UNICODE label. Signed-off-by: Pali Rohár --- diff --git a/tests/expected/blkid/low-probe-iso-different-iso-joliet-label b/tests/expected/blkid/low-probe-iso-different-iso-joliet-label new file mode 100644 index 0000000000..e740a5d7d0 --- /dev/null +++ b/tests/expected/blkid/low-probe-iso-different-iso-joliet-label @@ -0,0 +1,11 @@ +ID_FS_APPLICATION_ID=Joliet Application +ID_FS_BLOCK_SIZE=2048 +ID_FS_DATA_PREPARER_ID=Joliet Preparer +ID_FS_LABEL=Joliet_Label +ID_FS_LABEL_ENC=Joliet\x20Label +ID_FS_PUBLISHER_ID=Joliet Publisher +ID_FS_SYSTEM_ID=Joliet System id +ID_FS_TYPE=iso9660 +ID_FS_USAGE=filesystem +ID_FS_VERSION=Joliet\x20Extension +ID_FS_VOLUME_SET_ID=Joliet Volume set diff --git a/tests/expected/blkid/low-probe-iso-unicode-long-label b/tests/expected/blkid/low-probe-iso-unicode-long-label new file mode 100644 index 0000000000..9d4a48b82a --- /dev/null +++ b/tests/expected/blkid/low-probe-iso-unicode-long-label @@ -0,0 +1,11 @@ +ID_FS_APPLICATION_ID=Nero Linux +ID_FS_BLOCK_SIZE=2048 +ID_FS_DATA_PREPARER_ID=Naïve and very looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG DATA PREPARER +ID_FS_LABEL=Naïve_and_very_lOOOOOOOONG_LABEL +ID_FS_LABEL_ENC=Naïve\x20and\x20very\x20lOOOOOOOONG_LABEL +ID_FS_PUBLISHER_ID=Naïve and very looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG PUBLISHER +ID_FS_SYSTEM_ID=Naïve and very lONG SYSTEM IDENT +ID_FS_TYPE=iso9660 +ID_FS_USAGE=filesystem +ID_FS_VERSION=Joliet\x20Extension +ID_FS_VOLUME_SET_ID=Naïve and very looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG_VOLUME_SET diff --git a/tests/ts/blkid/images-fs/iso-different-iso-joliet-label.img.xz b/tests/ts/blkid/images-fs/iso-different-iso-joliet-label.img.xz new file mode 100644 index 0000000000..73c5f2b6b4 Binary files /dev/null and b/tests/ts/blkid/images-fs/iso-different-iso-joliet-label.img.xz differ diff --git a/tests/ts/blkid/images-fs/iso-unicode-long-label.img.xz b/tests/ts/blkid/images-fs/iso-unicode-long-label.img.xz new file mode 100644 index 0000000000..488be1ad2c Binary files /dev/null and b/tests/ts/blkid/images-fs/iso-unicode-long-label.img.xz differ