From patchwork Wed Dec 11 09:42:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11284587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A47F138D for ; Wed, 11 Dec 2019 09:42:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F921214D8 for ; Wed, 11 Dec 2019 09:42:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Pq5VyOlx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728653AbfLKJmc (ORCPT ); Wed, 11 Dec 2019 04:42:32 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48927 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728590AbfLKJmc (ORCPT ); Wed, 11 Dec 2019 04:42:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576057351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3qlUCV9KAzTRD5BLeh8Hw9oSDfU4THuhXKb8NvAbCk=; b=Pq5VyOlxmfWEfWw3z/Rw3qYSCO/QaT4aLWEZeKb7f4SrRztX6TwBgeGzhLO7F+JVxO51US 6rb6Hwb0QiP9jums+Ceczz9nLuBCRjxJbdXqttBGbwrYgj6FyibEcsn2AhhqAiscO6YeAO 6RjIeW1ePcNEIoujIB6eXgv6gNm0JqQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-180-RmA6yfBXPnC75X-WRRUQ3g-1; Wed, 11 Dec 2019 04:42:28 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85D67800D4C for ; Wed, 11 Dec 2019 09:42:27 +0000 (UTC) Received: from thuth.com (ovpn-117-11.ams2.redhat.com [10.36.117.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AFB763629; Wed, 11 Dec 2019 09:42:26 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , kvm@vger.kernel.org Cc: Drew Jones Subject: [kvm-unit-tests PATCH 1/4] scripts: Fix premature_failure() check with newer versions of QEMU Date: Wed, 11 Dec 2019 10:42:18 +0100 Message-Id: <20191211094221.7030-2-thuth@redhat.com> In-Reply-To: <20191211094221.7030-1-thuth@redhat.com> References: <20191211094221.7030-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: RmA6yfBXPnC75X-WRRUQ3g-1 X-Mimecast-Spam-Score: 0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org QEMU recently changed its output if it could not open a kernel file from "could not load kernel ..." to "could not open kernel ...", see QEMU commit 350f5233d755 ("hw/i386/pc: avoid an assignment in if condition in x86_load_linux()"). Thus we have to adapt our script that looks for this string accordingly. Signed-off-by: Thomas Huth --- scripts/runtime.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runtime.bash b/scripts/runtime.bash index fbad0bd..eb60890 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -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 kernel" -e "error loading" && + grep -q -e "could not \(load\|open\) kernel" -e "error loading" && return 1 RUNTIME_log_stderr <<< "$log"