From nobody Tue Feb 10 01:34:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635842565; cv=none; d=zohomail.com; s=zohoarc; b=JKHfn8GdaDCg5uc5imiKpyixqjiQ8JJpYykefHFWhn2jTZTcD/OUAZ0iir4MwbO2HLol1kBIJhoks3hyqyENucEs/lXuKeTWepUGT2G5Yy45pD2EAlyCH+G5UZh08Ud+4cliVkefpHJc2XnoEILFoxs4Kb6uBietzPU0F3RYyUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635842565; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EKG0tKklLgRk4YA9OrX5SnwD2Q874lcpxjeqTTiQFYw=; b=UXWdlwdicPoVPm5iqB53FhnLH5wdAwnn7egDas6L2edZ6OzuIuO3VsDwhd95/uEPyUosB1FiBj9n66PmMyNXP/lBvnOX586H0E0B6OLVGKlnqfNGHFX9aOCDixaRnyTb7pB1cP23IjXXpw18aoyjEamxl4xpUxB/l1uIIZe2CTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1635842565752243.05309446912452; Tue, 2 Nov 2021 01:42:45 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id z11-20020a1c7e0b000000b0030db7b70b6bso1190556wmc.1 for ; Tue, 02 Nov 2021 01:42:45 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id h22sm36426wmq.14.2021.11.02.01.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 01:42:43 -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=EKG0tKklLgRk4YA9OrX5SnwD2Q874lcpxjeqTTiQFYw=; b=ZSRohisD6mlmpfGEQ8DIS9r6VlKaamZLe7J+qarvCpEgt8gsJoj8VDTL2JPojnm/du p3RcRsUJL/2SZ0Q27EzGdHFpZAqe3BFyIlU9A+3GwALf6zwCKW3W2fbi/Ynx2WuVsGZT 018xKFzGgxU/+RS70LjSLYbngdm57KRTqzHcE1XY7+e1JVEOZNgj1xcliaqNYpra87zZ 75upDlVcDcg4ZgXYmFcdqZ5ItbuWE4Fwufg1PytgS+XIBSgXeFSn3nmgYo2cC9MG7g3d GsFIxT6AMAuO7Tx4dnkt/hLfGsd+VjcnBv82haxeHFNvkG1oZBd+KpzL8zfCNzTRX6Pk BxoQ== 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=EKG0tKklLgRk4YA9OrX5SnwD2Q874lcpxjeqTTiQFYw=; b=bnnicUvuVwdJHRf3sHbrdRihV3DuBOLJVoyA5NrVj/J9VDsO73Or9nzNMA4HUza8AG 1yGU0sVZRsLpG8zeKtWMWPx09W0+NseG/GUVK15V4NlbqEQLKkcbIb/SEtvj9p1ld3eP g9Feczl9Ya2H03+FYHtuokQzsRkThPVOIY/0/b6fGkVzCk7F6HMjpjpbdVbR5UXOBPTk J5M+mNf6D1xG3uqRBD9XBbQpv17gr0P0OoKTmoLm5ND4GyyMIBc7k5rGBxHPG1OrlDtX pOj6DgIJSL4EQNu9i4KFWZeZWzz4XdhCb3gGv0O2h1u3bO5fEYu87ZrG0D3AcJ6ideDg 2JYw== X-Gm-Message-State: AOAM530q/DxwgFPSxUxEOQbJ1QV7116kgzWjXYdfPmarhJgbb4zUJuTs CuSBoww3ygvCOSRCoLndMjE= X-Google-Smtp-Source: ABdhPJyXOLftb+nJLPZ721ch6mwG+e6e6aYy78HfficcvGnenbAQ407KzDOqgxr+NWHWcQ3uFnuytQ== X-Received: by 2002:a1c:c90f:: with SMTP id f15mr5351047wmb.78.1635842564091; Tue, 02 Nov 2021 01:42:44 -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 , Warner Losh , Cleber Rosa , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 2/6] tests/acceptance: Make pick_default_qemu_bin() more generic Date: Tue, 2 Nov 2021 09:42:28 +0100 Message-Id: <20211102084232.2965062-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102084232.2965062-1-f4bug@amsat.org> References: <20211102084232.2965062-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: 1635842566441100001 Make pick_default_qemu_bin() generic to find qemu-system or qemu-user binaries. Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v5: Use PEP3135 --- 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 1ed381f5037..9b2ea3b248a 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -45,7 +45,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. @@ -64,7 +64,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 @@ -179,14 +179,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: @@ -214,7 +214,7 @@ class Test(QemuBaseTest): def setUp(self): self._vms =3D {} =20 - super().setUp() + super().setUp('qemu-system-') =20 self.machine =3D self.params.get('machine', default=3Dself._get_unique_tag_val(= 'machine')) --=20 2.31.1