From nobody Tue Feb 10 06:57:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632760290; cv=none; d=zohomail.com; s=zohoarc; b=IZvsvRcB4D6YrBFc+XcAc9fw2+uyMReBHNSiXh8L3/aL+Ex0xfaPpjDuatYlPJic+AOSBSM7ptXkAXZh8sA2B2G3ZZAzIU3FUIzXd3xZNzPv9MlDypbYXPNAyB8flLtRRihOkL7qq2+FsRYlpWEhBjibIp0tYpBWVxyBXUiPzo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632760290; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T1aPkKUrc80d/vqmLgc+PWq3pe5Uicwcn8ttvXrLTeU=; b=IU/DGMLqPbJH8h0Le118y1By5VRszK79tTkrB0IEElAsZb+UM/XzrIaADhWf5EyrLPWbHyVDnV+MD5gSVXociEDnrHx7BznfWDNgStyiDFyje7jqbU9/tdKr/yfYNmK6NWSXiYldB52hPa0N3X1DAg7f7/dwAkCkFUuIq+2Xkds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1632760290247385.351753342046; Mon, 27 Sep 2021 09:31:30 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id c73-20020a1c9a4c000000b0030d040bb895so447274wme.2 for ; Mon, 27 Sep 2021 09:31:29 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id x5sm21242438wmk.32.2021.09.27.09.31.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 09:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T1aPkKUrc80d/vqmLgc+PWq3pe5Uicwcn8ttvXrLTeU=; b=FOnqWgbOkCQhcjkwn4FfWDxoBTEJ5m8sWco68AWUOC1dlk0SpdZ2A72Edkr2cuXkkh MWhliyTacJr28U3b2RCWEMcBhuOSDK770spxZyPUgUDDVn9sWLmubYGGZhC8bQAk//Wc NdUl028xnLXZMSxsIIq5lu/YRjsIkTaF7rjpb0AxCkQeFLSUE2rxd90bgrG041HJjHQf 1i0oJYx5jyZPM4OA/zMf+uNgL8j6tjRfjM3SYGKupGwXp1fZcfBwnNEVzt5ntKcVzOqp 20nSS+caITlgo5AYDiP2yNsLj3XzQ7hn+AA0gaKC92p+SQyyGAzYZGSMCypA2PBzDbQv yj3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=T1aPkKUrc80d/vqmLgc+PWq3pe5Uicwcn8ttvXrLTeU=; b=x3bbFmtPDTZgqrNeW7g6DEWEgJGqdua1Wef8TPp7APUoQtdsMFzQhbSnud6bcLfmdx 1Efs/5gZBk3ePF/xubvBlnNqP8tRS3HQH8GU8Qs7I44M8Oh/A/JOvs9oMEbUeKGvcNFa LyCDMF5dJur5EJxrbEFnfq2WhadtVL7VWE2ZjpIIceAQhO0ZLJn/LLeDQdcTNyF6Himr U/c+72dmQ6NeZDHxCoEFlxn9e6zbObL+8tRY49XJwRqlt674mO4v/O+wPqQJnILqxX7N 0BJ1RyYYkQGTBo6XNK99bCDNmcbbXQvCe1raSLcQUJCCO+BgfeYOnaKjBG/zD2AGXxMo hYVg== X-Gm-Message-State: AOAM533U9KLNUpZjiIyL27buljIeFnZu+e147BTuJ2GPeI6gJRfTobiN QugkbvozyLqMpXHmKGHO/0g= X-Google-Smtp-Source: ABdhPJznlZqOCkgEMrxGDYaocikq81fxFtsK9xSgVMuM1cqqXK0pAUCgiTLQUq0wzfUVgx7jxDlQng== X-Received: by 2002:a05:600c:350a:: with SMTP id h10mr1827114wmq.163.1632760288483; Mon, 27 Sep 2021 09:31:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Willian Rampazzo , Laurent Vivier , qemu-arm@nongnu.org, Wainer dos Santos Moschetta , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 2/6] tests/acceptance: Make pick_default_qemu_bin() more generic Date: Mon, 27 Sep 2021 18:31:12 +0200 Message-Id: <20210927163116.1998349-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927163116.1998349-1-f4bug@amsat.org> References: <20210927163116.1998349-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632760291589100001 Make pick_default_qemu_bin() generic to find qemu-system or qemu-user binaries. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- tests/acceptance/avocado_qemu/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 8fcbed74849..2b9b5dd27fe 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -52,7 +52,7 @@ def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) =20 =20 -def pick_default_qemu_bin(arch=3DNone): +def pick_default_qemu_bin(bin_prefix=3D'qemu-system-', arch=3DNone): """ Picks the path of a QEMU binary, starting either in the current working directory or in the source tree root directory. @@ -71,7 +71,7 @@ def pick_default_qemu_bin(arch=3DNone): # qemu binary path does not match arch for powerpc, handle it if 'ppc64le' in arch: arch =3D 'ppc64' - qemu_bin_relative_path =3D "./qemu-system-%s" % arch + qemu_bin_relative_path =3D os.path.join(".", bin_prefix + arch) if is_readable_executable_file(qemu_bin_relative_path): return qemu_bin_relative_path =20 @@ -185,14 +185,14 @@ def _get_unique_tag_val(self, tag_name): return vals.pop() return None =20 - def setUp(self): + def setUp(self, bin_prefix): self.arch =3D self.params.get('arch', default=3Dself._get_unique_tag_val('ar= ch')) =20 self.cpu =3D self.params.get('cpu', default=3Dself._get_unique_tag_val('cpu= ')) =20 - default_qemu_bin =3D pick_default_qemu_bin(arch=3Dself.arch) + default_qemu_bin =3D pick_default_qemu_bin(bin_prefix, arch=3Dself= .arch) self.qemu_bin =3D self.params.get('qemu_bin', default=3Ddefault_qemu_bin) if self.qemu_bin is None: @@ -220,7 +220,7 @@ class Test(QemuBaseTest): def setUp(self): self._vms =3D {} =20 - super(Test, self).setUp() + super(Test, self).setUp('qemu-system-') =20 self.machine =3D self.params.get('machine', default=3Dself._get_unique_tag_val(= 'machine')) --=20 2.31.1