From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Subject: [PATCH] scripts/runtime: Adjust the premature_failure check Date: Wed, 1 Jun 2016 08:20:12 +0200 Message-ID: <1464762012-21101-2-git-send-email-ldoktor@redhat.com> References: <1464762012-21101-1-git-send-email-ldoktor@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: kvm@vger.kernel.org, drjones@redhat.com, pbonzini@redhat.com, lvivier@redhat.com, ldoktor@redhat.com, rkrcmar@redhat.com Return-path: Received: from mx1.redhat.com ([209.132.183.28]:44225 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753965AbcFAGUX (ORCPT ); Wed, 1 Jun 2016 02:20:23 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 1CEDF2E51C9 for ; Wed, 1 Jun 2016 06:20:23 +0000 (UTC) In-Reply-To: <1464762012-21101-1-git-send-email-ldoktor@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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=C3=A1=C5=A1 Doktor --- 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=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 --=20 2.5.5