This part of tests/iso9660_test works on an intentionally bad ISO which
with older versions of GRUB will cause an endless cycle. Therefore the
test runs grub-fstest under the program timeout. A non-zero exit value
is taken as indication that the timeout was triggered. Non-empty output
from grub-fstest is taken as indication that a CE entry was skipped by an
old bug, thus breaking the endless cycle by mistake.
A change in grub-fstest causes output of an error message and a non-zero
exit value when the bad ISO is handled properly.
So add the new grub-fstest option -E to the run of grub-fstest on
iso9660_ce_loop.iso and iso9660_ce_loop2.iso. This suppresses the error
message and the non-zero exit value.
Signed-off-by: Thomas Schmitt <scdbac...@gmx.net>
---
tests/iso9660_test.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/iso9660_test.in b/tests/iso9660_test.in
index a1f752adf..677c777d9 100644
--- a/tests/iso9660_test.in
+++ b/tests/iso9660_test.in
@@ -20,7 +20,7 @@ for fs in iso9660_ce_loop iso9660_ce_loop2; do
{ echo "Failed to make temporary directory"; exit 99; }
gunzip <"$srcdir"/tests/${fs}.iso.gz >"${tempdir}/${fs}.iso" || exit 99
output=$(LC_ALL=C timeout -s KILL "60" \
- "@builddir@/grub-fstest" "${tempdir}/${fs}.iso" ls / ) || ret=$?
+ "@builddir@/grub-fstest" -E "${tempdir}/${fs}.iso" ls / ) || ret=$?
rm -rf "$tempdir"
if [ "${ret:-0}" -ne 0 -o -n "$output" ]; then
echo "FAIL ($fs)"
--
2.39.2
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
