Re: [kvm-unit-tests PATCH 10/32] scripts: Accommodate powerpc powernv machine differences

[Andrew Jones]

On Mon, Feb 26, 2024 at 08:11:56PM +1000, Nicholas Piggin wrote:
> The QEMU powerpc powernv machine has minor differences that must be
> accommodated for in output parsing:
> 
> - Summary parsing must search more lines of output for the summary
>   line, to accommodate OPAL message on shutdown.
> - Premature failure testing must tolerate case differences in kernel
>   load error message.
> 
> Acked-by: Thomas Huth 
> Signed-off-by: Nicholas Piggin 
> ---
>  scripts/runtime.bash | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> index 8f9672d0d..bb32c0d10 100644
> --- a/scripts/runtime.bash
> +++ b/scripts/runtime.bash
> @@ -9,7 +9,7 @@ FAIL() { echo -ne "\e[31mFAIL\e[0m"; }
>  extract_summary()
>  {
>  local cr=$'\r'
> -tail -3 | grep '^SUMMARY: ' | sed 's/^SUMMARY: /(/;s/'"$cr"'\{0,1\}$/)/'
> +tail -5 | grep '^SUMMARY: ' | sed 's/^SUMMARY: /(/;s/'"$cr"'\{0,1\}$/)/'
>  }
>  
>  # We assume that QEMU is going to work if it tried to load the kernel
> @@ -18,7 +18,7 @@ premature_failure()
>  local log="$(eval "$(get_cmdline _NO_FILE_4Uhere_)" 2>&1)"
>  
>  echo "$log" | grep "_NO_FILE_4Uhere_" |
> -grep -q -e "could not \(load\|open\) kernel" -e "error loading" &&
> +grep -q -e "[Cc]ould not \(load\|open\) kernel" -e "error loading" &&
>  return 1
>  
>  RUNTIME_log_stderr <<< "$log"
> -- 
> 2.42.0
>

Acked-by: Andrew Jones 

[kvm-unit-tests PATCH 10/32] scripts: Accommodate powerpc powernv machine differences

[Nicholas Piggin]

The QEMU powerpc powernv machine has minor differences that must be
accommodated for in output parsing:

- Summary parsing must search more lines of output for the summary
  line, to accommodate OPAL message on shutdown.
- Premature failure testing must tolerate case differences in kernel
  load error message.

Acked-by: Thomas Huth 
Signed-off-by: Nicholas Piggin 
---
 scripts/runtime.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index 8f9672d0d..bb32c0d10 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -9,7 +9,7 @@ FAIL() { echo -ne "\e[31mFAIL\e[0m"; }
 extract_summary()
 {
 local cr=$'\r'
-tail -3 | grep '^SUMMARY: ' | sed 's/^SUMMARY: /(/;s/'"$cr"'\{0,1\}$/)/'
+tail -5 | grep '^SUMMARY: ' | sed 's/^SUMMARY: /(/;s/'"$cr"'\{0,1\}$/)/'
 }
 
 # We assume that QEMU is going to work if it tried to load the kernel
@@ -18,7 +18,7 @@ premature_failure()
 local log="$(eval "$(get_cmdline _NO_FILE_4Uhere_)" 2>&1)"
 
 echo "$log" | grep "_NO_FILE_4Uhere_" |
-grep -q -e "could not \(load\|open\) kernel" -e "error loading" &&
+grep -q -e "[Cc]ould not \(load\|open\) kernel" -e "error loading" &&
 return 1
 
 RUNTIME_log_stderr <<< "$log"
-- 
2.42.0