From c733ed5012a3437ee4a69fdfe96fcd4a425f432f Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Mon, 16 Jan 2023 14:42:59 +0100 Subject: [PATCH] test: Work around some host dependent irrelevant script differences. Signed-off-by: Kristian Amlie --- tests/test_grub_integration.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_grub_integration.py b/tests/test_grub_integration.py index 40df32c..02abd71 100644 --- a/tests/test_grub_integration.py +++ b/tests/test_grub_integration.py @@ -172,13 +172,16 @@ class TestGrubIntegration: # * `root` variable is not set in offline copy. # * `fwsetup` is added somewhat randomly depending on availability both # on build host and device. + # * locale, lang and gettext settings and module may or may not be + # present depending on test host. try: connection.run("cp /data/grub-main.cfg /data/old-grub-modified.cfg") connection.run("cp /boot/grub/grub.cfg /data/new-grub-modified.cfg") connection.run( r"sed -i -En -e '/\bsearch\b/{s/ --hint[^ ]*//g;}' " "-e \"/^set root='hd0,gpt1'$/d\" " - r"-e '\,### BEGIN /etc/grub.d/30_uefi-firmware ###,{p; n; :loop; \,### END /etc/grub.d/30_uefi-firmware ###,b end; n; b loop; :end;}' " + r"-e '\,### BEGIN /etc/grub.d/30_uefi-firmware ###,{p; n; :uefi_loop; \,### END /etc/grub.d/30_uefi-firmware ###,b uefi_end; n; b uefi_loop; :uefi_end;}' " + r"-e ':locale_loop; /^\s*(set (locale_dir|lang)=|insmod gettext)/{n; b locale_loop;}' " "-e p " "/data/old-grub-modified.cfg /data/new-grub-modified.cfg" ) @@ -193,7 +196,8 @@ class TestGrubIntegration: connection.run( r"sed -i -En -e '/\bsearch\b/{s/ --hint[^ ]*//g;}' " "-e \"/^set root='hd0,gpt1'$/d\" " - r"-e '\,### BEGIN /etc/grub.d/30_uefi-firmware ###,{p; n; :loop; \,### END /etc/grub.d/30_uefi-firmware ###,b end; n; b loop; :end;}' " + r"-e '\,### BEGIN /etc/grub.d/30_uefi-firmware ###,{p; n; :uefi_loop; \,### END /etc/grub.d/30_uefi-firmware ###,b uefi_end; n; b uefi_loop; :uefi_end;}' " + r"-e ':locale_loop; /^\s*(set (locale_dir|lang)=|insmod gettext)/{n; b locale_loop;}' " "-e p " "/data/old-grub-mender-grubenv-modified.cfg /data/new-grub-mender-grubenv-modified.cfg" )