From eb6a4cc2e1e28f5e297378fb384e297dd238f7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
Date: Thu, 10 Dec 2020 02:38:06 +0100
Subject: [PATCH] libblkid: iso9660: add new test images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 <pali.rohar@gmail.com>
---
 .../low-probe-iso-different-iso-joliet-label      |  11 +++++++++++
 .../blkid/low-probe-iso-unicode-long-label        |  11 +++++++++++
 .../iso-different-iso-joliet-label.img.xz         | Bin 0 -> 712 bytes
 .../blkid/images-fs/iso-unicode-long-label.img.xz | Bin 0 -> 616 bytes
 4 files changed, 22 insertions(+)
 create mode 100644 tests/expected/blkid/low-probe-iso-different-iso-joliet-label
 create mode 100644 tests/expected/blkid/low-probe-iso-unicode-long-label
 create mode 100644 tests/ts/blkid/images-fs/iso-different-iso-joliet-label.img.xz
 create mode 100644 tests/ts/blkid/images-fs/iso-unicode-long-label.img.xz

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 000000000..e740a5d7d
--- /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 000000000..9d4a48b82
--- /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 0000000000000000000000000000000000000000..73c5f2b6b4f98047cb810895e01c67bd4c8edb5b
GIT binary patch
literal 712
zcmV;(0yq8rH+ooF000E$*0e?f03iV!0000G&sfazzyAV;T>t=Y{r~@?xBo{zNELE9
zVNtk}DCVPv2l?*g9)i;^#X39zOR;{*ii%AyqYc@ArsIqw5mVq<7{zsp;&=B%@7)fL
zN1rO?4P9(#0Gc?XM!jG%C3FAzH%#e3L_9+ui{W&Ky4dV!d~+tU;Tp~L_`8iI9I0I1
zL2|=Vj*eTO+&P!YV(G03jQ}1GP~-73VBN;wNGMp9XDy6vVB`|!^7L*}c$7^PW(a|r
z<Zd)&F95%g$sCNnVo?cLi|FG%MU8gt(`SK<2+=wXQ|Twpg<_<$5_nJv^&V=JkmsDp
zj$Dc+9!cwQUn<g{9xn^61IO)YL&Zqk5?YA*tXuk22WV7spRLaoh$2R(1tZTbWZ0Tc
zN8Ej%ir6KLo*?EX-XmyX@)Daz7|qWwEGht7+&12PyUQ2DDG*o&c;+!qxn4>qKcS~r
zdW`u?r0e3H7;ls`mMW137|X%F1#I#;lFY@}omp36MOr;F0Z$hLJKNB&B!)`T<z*FC
z0u`Lp0d5=3KI-P%cWIv@^sJv&cj0;wflB$1ve%Ijl`L9-?)$-O*OKF`QbM2hawz%H
zyQ*1}1H3)PX$;+=Hk1^&L|*76N=;NjuXs&lHmtz$OYugdOnZu$dGaXeOn0{k-3G{b
z&tnW)%QaxjWl>OnE?!Zh=eyN-<@5o4+?~J%m`#}d*ss-)55y%?`1O%CF$JZt?r*_x
zO-BsTkrAq`U>&;7u_qW@S%&FmQdqv}cC1<C<y!>^`N!I={QFWXbj==HAVT@wQ$6@8
zWC=Tf%PMT&wL9>{y)Iv>4?as~LXZ;<{}7Y-ad=ty3(fzPC`J#d{CwW~nlLU_z>kIV
ugMq&4rH6O`0001`IuTd~KSd}20ip$ffJ*>9(11X(#Ao{g000001X)@WnNiyS

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..488be1ad2ca12fc86985137ce948a627bebd00bf
GIT binary patch
literal 616
zcmV-u0+;>$H+ooF000E$*0e?f03iV!0000G&sfazzyAUzT>t=Y{r~@?xBo{zNELE9
zVNtk}DCVPv2l?*g9)i;^#X39zOR;{*ii%AyqYc@ArsIqw5mVq<7{zsp;&=B%@7)fL
zN1rO?4TT+l^(oy@rLbwyPWSf0EPLv;+)(Z|vWP|qi6~U=uX$q}DvF7INT(v({rhF9
z3com@?+!Zx3MOf0J+R_JgOfTe-J8Y;Hcj-UAy8mHO@hF5O^)s+9T|Kp)JAJpdB;WJ
z6o;7thTiXsQ9iw?uQc`2ty`u0S@K^C(S-JhOntv==|nWGoz&sV$Y<kS+RtG@PL05q
z4GGbl_s=v}it-y=6NThB@s@J9QVs{crVKIN5!Q9n`W5oP3_~tvOIA`(9oF<;I@L~9
zH8Va9hP>x6owqeH5zv^Lr<{C~8ODIYb`p$}q8N`c$J!h+X*p=YAUdWbyBNg-x<Aq)
ziYY~@j^;d09skyJgm8BM9L;ziOq2(>&I-`gaJQ-sot^49bZJm!CFxfkAR!lW71owa
zxFdPE#78fQIyt()usBMA%&H{URk?{S^)y<9x-O*cXL3MNSib3YtXbscTLlRD$J(v@
z`%)`(%^q7ILiycOJ@_eP2|IwxDs11iJMhH4E?=q-K1*gokP{C75R>?Ecv<)h&Ht4s
zMh~g{eBS$-FfLZWkA?Gtfxu<NB~$qIkv1^}rLgXA!EjAS4AGGhs;yuhy3VmD7+hI~
z>1I+`zUg+XS>)rf^R(;$0000<r;9Q+9A!uV0m1};fJ*?^_7ruo#Ao{g000001X)@I
Cg(Y49

literal 0
HcmV?d00001