On Wed, 11 Sep 2024 12:37:32 +0300
Vladimir Serbinenko <phco...@gmail.com> wrote:

> Fedora arm-efi and riscv64-efi are verbose and add a garbage line
> when shutting down. Ignore it

Shouldn't the trim_tail modifications in patch 1 and 5 obviate the need
for this? And why is the text being tested changed? I presume because
of time discrepencies, but if so can't we just check a less precise
date?

Glenn

> 
> Signed-off-by: Vladimir Serbinenko <phco...@gmail.com>
> ---
>  tests/grub_cmd_set_date.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in
> index 17673cd8a..153609399 100644
> --- a/tests/grub_cmd_set_date.in
> +++ b/tests/grub_cmd_set_date.in
> @@ -21,7 +21,7 @@ out=$(cat <<EOF | @builddir@/grub-shell
>  insmod datehook
>  date
>  if [ \$YEAR = 2004 -a \$MONTH = 4 -a \$DAY = 4 -a \$HOUR = 20 -a \$MINUTE = 
> 47 ]; then
> -  hello
> +  echo Back to 2004
>    halt
>  fi
>  date 2004-04-04 20:47:00
> @@ -29,7 +29,7 @@ reboot
>  EOF
>  )
>  
> -if [ "$(echo "$out" | tail -n 1)" != "Hello World" ]; then
> +if [ "$(echo "$out" | tail -n 3|grep "Back to 2004")" != "Back to 2004" ]; 
> then
>    echo "Test failed: $out"
>    exit 1
>  fi

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to