From patchwork Wed Jun 1 06:20:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?THVrw6HFoSBEb2t0b3I=?= X-Patchwork-Id: 9146099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E280960761 for ; Wed, 1 Jun 2016 06:20:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2CDD20410 for ; Wed, 1 Jun 2016 06:20:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C78DA2522B; Wed, 1 Jun 2016 06:20:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BB4520410 for ; Wed, 1 Jun 2016 06:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757189AbcFAGUY (ORCPT ); Wed, 1 Jun 2016 02:20:24 -0400 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) Received: from w541.redhat.com (vpn1-6-195.ams2.redhat.com [10.36.6.195]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u516KGbX017306; Wed, 1 Jun 2016 02:20:20 -0400 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= To: kvm@vger.kernel.org, drjones@redhat.com, pbonzini@redhat.com, lvivier@redhat.com, ldoktor@redhat.com, rkrcmar@redhat.com 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> In-Reply-To: <1464762012-21101-1-git-send-email-ldoktor@redhat.com> References: <1464762012-21101-1-git-send-email-ldoktor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 01 Jun 2016 06:20:23 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Thomas Huth --- 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 }