From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Huth <thuth@redhat.com>
Subject: Re: [kvm-unit-tests PATCH] scripts/runtime: Adjust the
 premature_failure check
Date: Mon, 13 Jun 2016 11:34:21 +0200
Message-ID: <575E7E1D.9010604@redhat.com>
References: <1464762012-21101-1-git-send-email-ldoktor@redhat.com>
 <1464762012-21101-2-git-send-email-ldoktor@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: drjones@redhat.com, lvivier@redhat.com, rkrcmar@redhat.com
To: =?UTF-8?B?THVrw6HFoSBEb2t0b3I=?= <ldoktor@redhat.com>,
	kvm@vger.kernel.org, pbonzini@redhat.com
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:51704 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S964895AbcFMJeY (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 13 Jun 2016 05:34:24 -0400
Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 98A646266E
	for <kvm@vger.kernel.org>; Mon, 13 Jun 2016 09:34:24 +0000 (UTC)
In-Reply-To: <1464762012-21101-2-git-send-email-ldoktor@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 01.06.2016 08:20, Luk=C3=A1=C5=A1 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)
>=20
> Signed-off-by: Luk=C3=A1=C5=A1 Doktor <ldoktor@redhat.com>
> ---
>  scripts/runtime.bash | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>=20
> 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=3D"$(eval $(get_cmdline _NO_FILE_4Uhere_) 2>&1)"
> -    local last_line=3D$(tail -1 <<< "$log")
> =20
> -    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
> =20
>      RUNTIME_log_stderr <<< "$log"
> =20
> -    echo "$last_line"
> +    echo "$log"
>      return 0
>  }
> =20

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