[kvm-unit-tests PATCH v2] Adjust the premature_failure check

[kvm-unit-tests PATCH v2] Adjust the premature_failure check

[Lukáš Doktor]

Hello guys,

The a51bab13689b8eeeb6d1cc614fd56a4e86718ed4 change is not compatible with qemu-system-ppc64. Please find the fix attached.

Sample outputs are (Czech locale):

    $ qemu-system-x86_64 -kernel  _NO_FILE_4Uhere_
    qemu: could not load kernel '_NO_FILE_4Uhere_': No such file or directory
    $ qemu-system-aarch64 -kernel  _NO_FILE_4Uhere_  -machine virt
    _NO_FILE_4Uhere_: Adres?? nebo soubor neexistuje
    qemu: could not load kernel '_NO_FILE_4Uhere_'
    $ qemu-system-ppc64 -kernel  _NO_FILE_4Uhere_
    _NO_FILE_4Uhere_: No such file or directory
    qemu: error loading _NO_FILE_4Uhere_: Failed to load ELF

Changes:

    v2: Check for line containing one of the failure messages
        and the dummy file name.
    v2: Use the full qemu output, not just the last_line

Kind regards,
Lukáš

[PATCH] scripts/runtime: Adjust the premature_failure check

[Lukáš Doktor]

The premature_failure check fails on qemu-system-ppc64 as it uses
different message. This patch modifies the condition so it works
(hopefully) for all archs. (tested on x86_64, ppc64, aarch64)

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
---
 scripts/runtime.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index 6c4c800..0503cf0 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -15,14 +15,14 @@ extract_summary()
 premature_failure()
 {
     local log="$(eval $(get_cmdline _NO_FILE_4Uhere_) 2>&1)"
-    local last_line=$(tail -1 <<< "$log")
 
-    echo "$last_line" | grep -qi "could not load kernel" &&
+    echo "$log" | grep "_NO_FILE_4Uhere_" |
+        grep -q -e "could not load kernel" -e "error loading" &&
         return 1
 
     RUNTIME_log_stderr <<< "$log"
 
-    echo "$last_line"
+    echo "$log"
     return 0
 }
 
-- 
2.5.5

Re: [kvm-unit-tests PATCH] scripts/runtime: Adjust the premature_failure check

[Thomas Huth]

On 01.06.2016 08:20, Lukáš Doktor wrote:
> The premature_failure check fails on qemu-system-ppc64 as it uses
> different message. This patch modifies the condition so it works
> (hopefully) for all archs. (tested on x86_64, ppc64, aarch64)
> 
> Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
> ---
>  scripts/runtime.bash | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> index 6c4c800..0503cf0 100644
> --- a/scripts/runtime.bash
> +++ b/scripts/runtime.bash
> @@ -15,14 +15,14 @@ extract_summary()
>  premature_failure()
>  {
>      local log="$(eval $(get_cmdline _NO_FILE_4Uhere_) 2>&1)"
> -    local last_line=$(tail -1 <<< "$log")
>  
> -    echo "$last_line" | grep -qi "could not load kernel" &&
> +    echo "$log" | grep "_NO_FILE_4Uhere_" |
> +        grep -q -e "could not load kernel" -e "error loading" &&
>          return 1
>  
>      RUNTIME_log_stderr <<< "$log"
>  
> -    echo "$last_line"
> +    echo "$log"
>      return 0
>  }
>  

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [kvm-unit-tests PATCH] scripts/runtime: Adjust the premature_failure check

[Paolo Bonzini]

On 13/06/2016 11:34, Thomas Huth wrote:
> Reviewed-by: Thomas Huth <thuth@redhat.com>


Applied, thanks.

paolo