From nobody Sat Dec 28 10:50:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1734451277; cv=none; d=zohomail.com; s=zohoarc; b=YsfNIVuIOACy5tQ5dYPXsaIG9l5QnN5+4v9QvmOBR4MsygqoAh3dOsxyvD/D8WrYA2mMpLdhC0xS0O8Oxd13f4TsbNpLznFXNcwTKxa+zMBR9hAkWRokVHdVzZiws5qL4HLZYjp0pBSOYGMiRK7gScNurxtYtkKtML9YlJJYKnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734451277; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QAjQiwP0haDcUnPsVDuIIqdIJF1iPPhwSLsXKgeS0eY=; b=bYOwKB8PlSJGhn9lb+/pvCeuJCsWAYysQAP+0ODUSpy0tGDQ5Mwpx6lF346RpG+D4SNDcHQ42cFKeHdDfgCccujv7IwGiGTBLVpM7YRhhfuQgIgRWu+9mNNm5B4ixHxKPtsfmdpRKhckmShkOqLs31+jTN8WIdOiGkGD5uj0EmA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1734451277454618.0344081129756; Tue, 17 Dec 2024 08:01:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNa0F-0004Nt-FV; Tue, 17 Dec 2024 11:01:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNa03-0004Kc-8V for qemu-devel@nongnu.org; Tue, 17 Dec 2024 11:00:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNa01-00028u-FL for qemu-devel@nongnu.org; Tue, 17 Dec 2024 11:00:42 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-649-Du8dVYYMOIuXR1VRruUjVg-1; Tue, 17 Dec 2024 11:00:37 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8AF601955F4A; Tue, 17 Dec 2024 16:00:36 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.136]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2F0FB300F9B5; Tue, 17 Dec 2024 16:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734451240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QAjQiwP0haDcUnPsVDuIIqdIJF1iPPhwSLsXKgeS0eY=; b=EX1I57OOXTIfXfMSXNcQ49v/q8g4eF0OXPO2eKBu0f0zG3bc+UQOplESVjdnR9R+wMXxcS T7ZsCluBpy+d97oxWx/OuWLaMdY3CPvyxXBMuzhM+UJnA6s/tUCYPgn9HmzWpPS7B1N84H AOEi6GUChBTf5hkSIG8W7WDSUTD6CG4= X-MC-Unique: Du8dVYYMOIuXR1VRruUjVg-1 X-Mimecast-MFC-AGG-ID: Du8dVYYMOIuXR1VRruUjVg From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 12/32] tests/functional: switch over to using self.build_file(...) Date: Tue, 17 Dec 2024 15:59:33 +0000 Message-ID: <20241217155953.3950506-13-berrange@redhat.com> In-Reply-To: <20241217155953.3950506-1-berrange@redhat.com> References: <20241217155953.3950506-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.116, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1734451278072116600 This removes direct access of the 'BUILD_DIR' variable. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/functional/qemu_test/cmd.py | 5 ++--- tests/functional/qemu_test/testcase.py | 4 ++-- tests/functional/test_aarch64_virt.py | 5 ++--- tests/functional/test_virtio_gpu.py | 11 +++-------- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/tests/functional/qemu_test/cmd.py b/tests/functional/qemu_test= /cmd.py index bebcd46dcf..c8971de00a 100644 --- a/tests/functional/qemu_test/cmd.py +++ b/tests/functional/qemu_test/cmd.py @@ -16,7 +16,6 @@ import os.path import subprocess =20 -from .config import BUILD_DIR =20 def which(tool): """ looks up the full path for @tool, returns None if not found @@ -205,10 +204,10 @@ def get_qemu_img(test): =20 # If qemu-img has been built, use it, otherwise the system wide one # will be used. - qemu_img =3D os.path.join(BUILD_DIR, 'qemu-img') + qemu_img =3D test.build_file('qemu-img') if os.path.exists(qemu_img): return qemu_img qemu_img =3D which('qemu-img') if qemu_img is not None: return qemu_img - test.skipTest(f"qemu-img not found in {BUILD_DIR} or '$PATH'") + test.skipTest(f"qemu-img not found in build dir or '$PATH'") diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu= _test/testcase.py index 2174fbb155..493938240c 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -133,8 +133,8 @@ def setUp(self, bin_prefix): self.arch =3D self.qemu_bin.split('-')[-1] self.socketdir =3D None =20 - self.outputdir =3D os.path.join(BUILD_DIR, 'tests', 'functional', - self.arch, self.id()) + self.outputdir =3D self.build_file('tests', 'functional', + self.arch, self.id()) self.workdir =3D os.path.join(self.outputdir, 'scratch') os.makedirs(self.workdir, exist_ok=3DTrue) =20 diff --git a/tests/functional/test_aarch64_virt.py b/tests/functional/test_= aarch64_virt.py index c967da41b4..5bc461b482 100755 --- a/tests/functional/test_aarch64_virt.py +++ b/tests/functional/test_aarch64_virt.py @@ -14,7 +14,6 @@ import os import logging =20 -from qemu_test import BUILD_DIR from qemu_test import QemuSystemTest, Asset from qemu_test import exec_command, wait_for_console_pattern from qemu_test import get_qemu_img, run_cmd @@ -54,8 +53,8 @@ def test_alpine_virt_tcg_gic_max(self): "mte=3Don," "gic-version=3Dmax,iommu=3Dsmmuv3") self.vm.add_args("-smp", "2", "-m", "1024") - self.vm.add_args('-bios', os.path.join(BUILD_DIR, 'pc-bios', - 'edk2-aarch64-code.fd')) + self.vm.add_args('-bios', self.build_file('pc-bios', + 'edk2-aarch64-code.fd')) self.vm.add_args("-drive", f"file=3D{iso_path},media=3Dcdrom,forma= t=3Draw") self.vm.add_args('-device', 'virtio-rng-pci,rng=3Drng0') self.vm.add_args('-object', 'rng-random,id=3Drng0,filename=3D/dev/= urandom') diff --git a/tests/functional/test_virtio_gpu.py b/tests/functional/test_vi= rtio_gpu.py index 7654421e6b..81c9156d63 100755 --- a/tests/functional/test_virtio_gpu.py +++ b/tests/functional/test_virtio_gpu.py @@ -6,7 +6,6 @@ # later. See the COPYING file in the top-level directory. =20 =20 -from qemu_test import BUILD_DIR from qemu_test import QemuSystemTest, Asset from qemu_test import wait_for_console_pattern from qemu_test import exec_command_and_wait_for_pattern @@ -18,12 +17,8 @@ import subprocess =20 =20 -def pick_default_vug_bin(): - relative_path =3D "./contrib/vhost-user-gpu/vhost-user-gpu" - if is_readable_executable_file(relative_path): - return relative_path - - bld_dir_path =3D os.path.join(BUILD_DIR, relative_path) +def pick_default_vug_bin(test): + bld_dir_path =3D test.build_file("contrib", "vhost-user-gpu", "vhost-u= ser-gpu") if is_readable_executable_file(bld_dir_path): return bld_dir_path =20 @@ -86,7 +81,7 @@ def test_vhost_user_vga_virgl(self): # FIXME: should check presence of vhost-user-gpu, virgl, memfd etc self.require_accelerator('kvm') =20 - vug =3D pick_default_vug_bin() + vug =3D pick_default_vug_bin(self) if not vug: self.skipTest("Could not find vhost-user-gpu") =20 --=20 2.46.0