From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mJj30-0005vG-Hy for mharc-grub-devel@gnu.org; Fri, 27 Aug 2021 17:05:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJj2y-0005rH-4N for grub-devel@gnu.org; Fri, 27 Aug 2021 17:05:56 -0400 Received: from mout.gmx.net ([212.227.17.20]:50639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJj2w-0002v4-1J for grub-devel@gnu.org; Fri, 27 Aug 2021 17:05:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630098347; bh=EQFzULvCRZ3rG7NblWIV++n+aNcB4ATxyfFVGUi5iOE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=UJoaDiXGp5xhi6NrO+aPR2ydPiBT8iJOChAeR9jc6Q5xzn3Rlype4hlK25hpwk05N wuxVRzNRxbN5FIGGVzYnLeve7JB6esZPDqTL/FT3g3e9pOSgJ9kzSXkm2zt3ZaqHaW pn39dq0e/Sy5xPNJ9nUVQpM41rLOU/WnFszSqDP8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from ts7.local ([84.179.233.243]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MiJZO-1mz5wb1wuc-00fO5n; Fri, 27 Aug 2021 23:05:47 +0200 From: Thomas Schmitt To: grub-devel@gnu.org, daniel.kiper@oracle.com, development@efficientek.com Cc: Thomas Schmitt Subject: [PATCH] tests: Let xorriso fixely assume UTF-8 as local character set Date: Fri, 27 Aug 2021 23:05:06 +0200 Message-Id: <20210827210506.17586-1-scdbackup@gmx.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:e+xlbljk3BHckWIMxJGzaFjKE/nKUeBMOMtUH0OM5j9JZZia7YH pOKkGP0mUW87j2GZU0xeiyAJ/wT1PDqkCyrpdIMR5R039Fh3r/Nx3YtXIaMLuL36IC38GRA l20Lz1927ySMNS5FMtbD0u6EFBRqlLlwgVN3/Q8Ektwo2cWJlOHqcmbuJ7DZAogzqdh037i wlBnIBlSIKiyBG8gVMviQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:IxeFvFkam58=:jdkZfQs7WdUO6o1JOlQ4Xa Ad4btx5/vmF6RI7vOOAi3NDxsMP4BGg8rhMlV/3wF/bmjZeI7mLAmT+EUDq1d5d5nXGpFhirf wgh14kl+InU8xfTQbQQzi2xgyJ2I5lSxB1m1rIPTyIn9RdTgo5SWsmR7pRsh+AKBEbSNmuPWm Qd14EBx2mJ3+0JsXtFPcndlShfVjmGRzOeQOylagX9at07y8k79haH0mmtzcps9K3wZH61HeF VZwE6ZRIN6FtoigzNXbvHKeQLsY81FEcoLngONFC743Tij5xISvoDmC2pPPzauXs93KUqd4AV n0VD8UB6XcYv/YSrLL2D9Bt3GSVHBQZmdSqnO3EWZHAPpzkXxPRAl3CInb5VQ30mfx8o5C7Gf B4O7h/52tQXsdH5tpxLDnk7McB+RyVB711YcgwP2tT7u+LP+8ClnlAvdxzsSbiUSQvkCMuyTI Y8ceBE18qK4QrWe1iRODxkZ7ffCeuIdA8r+yvlAE+19sw+U9BeV+OTZFjZIs0uZDHh/TJ7irh 2IdrKpaqeZ+x786/roPLTr6NwMP92chuZbOZ/oA+eN/xnggeuMAwu1MN60ZzOgQGe3U1nzV0h lldQ8rQP9+BYx1ZB2oSgDc9CWPXcSVgXP3UlFukPB9vl1NRE8TF5qb2JbMAzWcOZdd27kyltg poOlTuZUubO7hN52I4dNxC+fO//G32XnoSWL2fIK+RUET6Srj8GPqbiHfEMFn/CiXhFNOvGne ATxp+h18pyOZw19eJnU/EVJXdWnpNXHK5152opujeNEpkHP4YxEtNw4VFdA+wXFBZxR6o+GYy 8XtZGqQgEtjdSyUXKQYA2INOm5T6ra7P+uDKD9FjmHiyvw+wivxYPa0bRpudaC6sjfqsBmmSU bQcJUsrt624vhRXn/lAgxblEAXwHnA9Qe66t9L+fTevAttM17UCjmlMMeFPDzxHeu2raLwU+0 vPvdgObsC5kCn4Kar5s55NlrFNmNagBDsPCwzgaxjDSAx92dfuXNJCUmsIIeQhJaJot0OMr/B UBlAiDA23o0qW07ZMci+p2L7T9VmITG5fObZvnbIpWN5R1yM0neS7KIZ8l5ozVR185pCehTIh oMKM8TdD/c7aLW+P8AKSAGSGj3Seu9Edh5kkGvdy5IVDDMNud0tI0P48A== Received-SPF: pass client-ip=212.227.17.20; envelope-from=scdbackup@gmx.net; helo=mout.gmx.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Aug 2021 21:05:56 -0000 iso9660_test fails if the effective locale is not UTF-8. This happens because xorriso needs to convert file names and FSLABEL to UCS-2 when preparing a Joliet tree. grub-fs-tester obviously intends to use UTF-8 as character set, but xorriso assumes by default the result of nl_langinfo(3) with item CODESET. So override the result of nl_langinfo(CODESET) by options of xorriso -as mkisofs. Signed-off-by: Thomas Schmitt =2D-- tests/util/grub-fs-tester.in | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in index bfc425e1f..4f581b638 100644 =2D-- a/tests/util/grub-fs-tester.in +++ b/tests/util/grub-fs-tester.in @@ -8,6 +8,10 @@ GRUBFSTEST=3D"@builddir@/grub-fstest" tempdir=3D`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 +# xorriso -as mkisofs options to ignore locale when processing file names= and +# FSLABEL. This is especially needed for the conversion to Joliet UCS-2. +XORRISOFS_CHARSET=3D"-input-charset UTF-8 -output-charset UTF-8" + # This wrapper is to ease insertion of valgrind or time statistics run_it () { LC_ALL=3DC "$GRUBFSTEST" "$@" @@ -1020,31 +1024,31 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLO= GSECSIZE" 1); do (cd "$MASTER"; find . | cpio -o -H "$(echo ${fs} | sed 's@^cpio_@@'= )" > "${FSIMAGEP}0.img" ) ;; x"ziso9660") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso -compliance rec_mtime -set_filter_r --zisofs -- -zisofs def= ault -as mkisofs -iso-level 3 -graft-points -R -J -joliet-long -V "$FSLABE= L" --modification-date=3D$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}= 0.img" -- -set_filter_r --zisofs -- -zisofs default -add /=3D"$MASTER" ;; + xorriso -compliance rec_mtime -set_filter_r --zisofs -- -zisofs def= ault -as mkisofs $XORRISOFS_CHARSET -iso-level 3 -graft-points -R -J -joli= et-long -V "$FSLABEL" --modification-date=3D$(echo ${FSUUID} | sed 's/-//g= ;') -o "${FSIMAGEP}0.img" -- -set_filter_r --zisofs -- -zisofs default -a= dd /=3D"$MASTER" ;; x"iso9660") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-leve= l 3 -graft-points -V "$FSLABEL" --modification-date=3D$(echo ${FSUUID} | s= ed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge off -compliance rec_mtime -as mkisofs $XORRISOF= S_CHARSET -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=3D$= (echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; x"joliet") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-lev= el 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=3D$(e= cho ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge off -compliance rec_mtime -as mkisofs $XORRISO= FS_CHARSET -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modi= fication-date=3D$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /= =3D"$MASTER" ;; x"rockridge") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level= 3 -graft-points -V "$FSLABEL" --modification-date=3D$(echo ${FSUUID} | se= d 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge on -compliance rec_mtime -as mkisofs $XORRISOFS= _CHARSET -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=3D$(= echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; x"rockridge_joliet") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level= 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=3D$(ech= o ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge on -compliance rec_mtime -as mkisofs $XORRISOFS= _CHARSET -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modifi= cation-date=3D$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D= "$MASTER" ;; x"iso9660_1999") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-leve= l 4 -graft-points -V "$FSLABEL" --modification-date=3D$(echo ${FSUUID} | s= ed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge off -compliance rec_mtime -as mkisofs $XORRISOF= S_CHARSET -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=3D$= (echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; x"joliet_1999") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-lev= el 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=3D$(e= cho ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge off -compliance rec_mtime -as mkisofs $XORRISO= FS_CHARSET -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modi= fication-date=3D$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /= =3D"$MASTER" ;; x"rockridge_1999") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level= 4 -graft-points -V "$FSLABEL" --modification-date=3D$(echo ${FSUUID} | se= d 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge on -compliance rec_mtime -as mkisofs $XORRISOFS= _CHARSET -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=3D$(= echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; x"rockridge_joliet_1999") FSUUID=3D$(date -u +%Y-%m-%d-%H-%M-%S-00); - xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level= 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=3D$(ech= o ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D"$MASTER" ;; + xorriso --rockridge on -compliance rec_mtime -as mkisofs $XORRISOFS= _CHARSET -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modifi= cation-date=3D$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /=3D= "$MASTER" ;; x"romfs") genromfs -V "$FSLABEL" -f "${FSIMAGEP}0.img" -d "$MASTER" ;; xsquash4_*) =2D- 2.20.1