From nobody Sat Nov 15 06:55:07 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1755603007; cv=none; d=zohomail.com; s=zohoarc; b=HZBuMl9GOiy6Bn273G4Wprj57OHV3YSGu8jIKJJLV3CG0dTzDsxpZGqe1eiWsnzoWDQbn+GQy2WGYccabUt81kZ1OlhuGULdM7lSjitMpeZkyS1Tgrs8Il2IeNoPW8GnnUUrcrTrcystinS8FxPvx1HTcPbbTSTYt/RP/JtPF5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755603007; h=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=dh0Zy25mJ/Z3CZswGi+44lW+YlmrL9WzQGlooeugvc8=; b=mbUwmL917eXSxiL3sC0lRpXpO3aSid4nrFmHkcoAJk2H5oJqLIzxDAvhVtEIWv4pu0ZZGF2GBQdTDqAUqzhBUvG/AZVmvI2K3eTU/92qA7PhPNtndjs0uEVYrq9G1nZ1nV8pL1IibMubdjaInSz68tA0tVxvl0gtwgJkLJRTYeo= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755603007208894.2214076415324; Tue, 19 Aug 2025 04:30:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uoKS3-0003Fb-I7; Tue, 19 Aug 2025 07:24:27 -0400 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 1uoKS1-0003El-Kv for qemu-devel@nongnu.org; Tue, 19 Aug 2025 07:24:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uoKRz-0007Av-VJ for qemu-devel@nongnu.org; Tue, 19 Aug 2025 07:24:25 -0400 Received: from mx-prod-mc-04.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-102-gktDDjKOPfilHjd29zVsLg-1; Tue, 19 Aug 2025 07:24:22 -0400 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F25641955D61; Tue, 19 Aug 2025 11:24:20 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.251]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C067930001A8; Tue, 19 Aug 2025 11:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755602663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dh0Zy25mJ/Z3CZswGi+44lW+YlmrL9WzQGlooeugvc8=; b=eSw/K4ZUgQ0ruqU7ENvL2PM5EqRw57YlZYRMaHfjttde/hZMlzam1IYGuJzGGJJefUPkxE c9ZEqDLazLxPJcmZUxFeZgAAqjdupw2EGJZn9Bb0Mrskx0e35h0SCh++GWFuPUX7Bh1sYl 7PHzhtMX92xKvP7EoZo/JdC70ZaZBiY= X-MC-Unique: gktDDjKOPfilHjd29zVsLg-1 X-Mimecast-MFC-AGG-ID: gktDDjKOPfilHjd29zVsLg_1755602661 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 04/25] tests/functional/meson.build: Allow tests to reside in subfolders Date: Tue, 19 Aug 2025 13:23:41 +0200 Message-ID: <20250819112403.432587-5-thuth@redhat.com> In-Reply-To: <20250819112403.432587-1-thuth@redhat.com> References: <20250819112403.432587-1-thuth@redhat.com> MIME-Version: 1.0 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1755603009079116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth We are going to move target-specific tests to subfolders that are named after the target (and generic tests will be put into a "generic" folder), so prepare the meson.build file to allow such locations, too. Reviewed-by: Pierrick Bouvier Signed-off-by: Thomas Huth --- tests/functional/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 356aad12dee..8c24ac1cc2d 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -423,7 +423,13 @@ foreach speed : ['quick', 'thorough'] =20 foreach test : target_tests testname =3D '@0@-@1@'.format(target_base, test) - testfile =3D 'test_' + test + '.py' + if fs.exists('test_' + test + '.py') + testfile =3D 'test_' + test + '.py' + elif fs.exists('generic' / 'test_' + test + '.py') + testfile =3D 'generic' / 'test_' + test + '.py' + else + testfile =3D target_base / 'test_' + test + '.py' + endif testpath =3D meson.current_source_dir() / testfile teststamp =3D testname + '.tstamp' test_precache_env =3D environment() --=20 2.50.1