From patchwork Wed Mar 28 16:37:05 2018 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: 10313557 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 0241460212 for ; Wed, 28 Mar 2018 16:37:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E785228930 for ; Wed, 28 Mar 2018 16:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBFDC29DBC; Wed, 28 Mar 2018 16:37:20 +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 8A69D29AFB for ; Wed, 28 Mar 2018 16:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753253AbeC1QhS (ORCPT ); Wed, 28 Mar 2018 12:37:18 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47608 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753144AbeC1QhR (ORCPT ); Wed, 28 Mar 2018 12:37:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BCB9840704AD for ; Wed, 28 Mar 2018 16:37:16 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-204-97.brq.redhat.com [10.40.204.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73650215CDC5; Wed, 28 Mar 2018 16:37:15 +0000 (UTC) From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= To: kvm@vger.kernel.org, kwolf@redhat.com, mreitz@redhat.com, ldoktor@redhat.com Subject: [PATCH 1/1] qemu-iotests: Try host architecture as first when detecting QEMU Date: Wed, 28 Mar 2018 18:37:05 +0200 Message-Id: <20180328163705.24509-2-ldoktor@redhat.com> In-Reply-To: <20180328163705.24509-1-ldoktor@redhat.com> References: <20180328163705.24509-1-ldoktor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 28 Mar 2018 16:37:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 28 Mar 2018 16:37:16 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ldoktor@redhat.com' RCPT:'' Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the QEMU_PROG detection simply gets the first available qemu-binary. This patch adds to the list the current architecture which should give better results. Signed-off-by: Lukáš Doktor --- tests/qemu-iotests/check | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index ec8033350d..ef2aede965 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -542,7 +542,9 @@ then export QEMU_PROG="$build_root/$arch-softmmu/qemu-system-$arch" else pushd "$build_root" > /dev/null - for binary in *-softmmu/qemu-system-* + arch=$(uname -m) + [[ "$arch" =~ "ppc64" ]] && arch=ppc64 # ppc64le machine uses ppc64 target + for binary in "$arch-softmmu/qemu-system-$arch" *-softmmu/qemu-system-* do if [ -x "$binary" ] then