From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84E65CA1013 for ; Thu, 4 Sep 2025 08:14:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu55w-0007TR-UI; Thu, 04 Sep 2025 04:13:25 -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 1uu54l-0006PI-L3 for qemu-riscv@nongnu.org; Thu, 04 Sep 2025 04:12:17 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu54M-00043n-76 for qemu-riscv@nongnu.org; Thu, 04 Sep 2025 04:12:10 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-61cd6089262so1203266a12.3 for ; Thu, 04 Sep 2025 01:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973504; x=1757578304; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=myCatgpniSey/NjO+dQuRIOhbIuhsJO0uetvy2+5HH0=; b=RUxR2UhYbVNB7RMY5XfgxDcFmBAI78Y24kCaKVwfdUCAqdRnbSNVHHJ31raF+IjUao WM2u8pTa+xGdyee6Q0SRyk8jaHv5BvkODZOs/Z18JkD4OSL0prIiSn/kvEXAxZJHh+C+ +5AyX9x/8KEP1vVqMT15OVhpwwYOLYinUH+BQgezubS/ZaEMYKJGpE2/ThiyxP+LLP6f TBCc63DRH9/rhlSbex46dRaIZ3ZD88JcDjHTMYPhi5jvIdHdxhZwoFHQckYS0jKcrQoD a4H5hYKV8OO8FUgaRK5aHujBFQmXJ3A9Br/MSzwEhe8pQOkESDG9NJqDAPoKs109vnTB zxHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973504; x=1757578304; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=myCatgpniSey/NjO+dQuRIOhbIuhsJO0uetvy2+5HH0=; b=lT7wGG38bZ7LiWGc7l3lH+glkfmsglaNqbkugrEiCiAPxjTdffIrJjeUWkGXDDGVGG WACk8n1xt02Qh3t6K8TuqXpPG0tlDf16eKBjx1J7+65Xgh9V/TvhCeGSYPP5SAI7aWut +Gpc50QPp7IHMRfcJwtFjXakBaHUF1QJ+M4EV3wPdfcKRt1VfSDvYaneJjNcC/nIdOPB P9I6sHRhy6CX+HWHv8IH1+FUDkjrqPgXzMoQ9aMst6tQ9Dne0HPlNkbZWFAHu7Vy3x+x XwC+vt1j6ClFsXEm3D7PoWQ2SR1uXDQ3MyNteonxLum/WzqhTWm9gjCtHPjIp8teKrhB 0X4A== X-Forwarded-Encrypted: i=1; AJvYcCVwhXkr5Uvmg5K5JIghChzLnwrwUwqoWtfLUwTZlCh0gF6Z7sp04GXw3CX24f3i+ta54cJ0zHFUCGsv@nongnu.org X-Gm-Message-State: AOJu0Yzj/gEDi8XRAAT14Ba6wNtyZx5CUA321n5gcxpUYL/8H2YGBwfZ Uy9kGKcDQnTpVFrha8CXCnaBUSCcBvOYOao78sKHDkYuf7nDFRHBGV1kRsVMb0X1CbA= X-Gm-Gg: ASbGncvfpIRhr0YikhnfCbrz5e+isbvJki3e7sHAp/sLST5pLc6TxPSR3nIGo0iACtx dFwK+Dgm4qdXrmR13YIxquOS52/6xSuIboT8JljUASgBorjnDmnMqCuH2fZKWq49KFfXaBoxbYn OkLyx8sGFSjntVjcbXlM6DIubJpsdYZmp86b+1XPoCSPq4/fbe3H66R3tAvvtDckFv3q7MHPOr3 8QwpNc6ULH7hc7luGFpLhqaD2J+KXJNjHbYF35lMBD5w13Y7sT2MM0zVHwGNZuHUwHzqRfcIIqz jYf6RIZgq47L9lfy8xFNktkWWm0M81BAZzA9fyOAIYYLbiSrm/5VVptBUMWZfw5WBvpKPr3uHzn +W7jE1VELHT+S1ovZr0doC1g= X-Google-Smtp-Source: AGHT+IEkvYRALNYOlXlCh0M9P7tOTgw2dIkqwHytdvjqGaEFKKMvexexT1+4HGfULBPkmc4HuBN2QQ== X-Received: by 2002:a05:6402:40ce:b0:61d:cd5:8b6e with SMTP id 4fb4d7f45d1cf-61d260cc220mr16736785a12.0.1756973504083; Thu, 04 Sep 2025 01:11:44 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61ede659366sm2877110a12.24.2025.09.04.01.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:11:43 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 16B025FA31; Thu, 04 Sep 2025 09:11:30 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Reinoud Zandijk , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Huacai Chen , Zhao Liu , Paolo Bonzini , Alistair Francis , qemu-arm@nongnu.org, Fam Zheng , Helge Deller , Matthew Rosato , Fabiano Rosas , qemu-rust@nongnu.org, Bibo Mao , qemu-riscv@nongnu.org, Thanos Makatos , Liu Zhiwei , Riku Voipio , Cameron Esfahani , Alexander Graf , Laurent Vivier , Harsh Prateek Bora , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-ppc@nongnu.org, Stafford Horne , Sunil Muthuswamy , Jagannathan Raman , Igor Mammedov , Brian Cain , Phil Dennis-Jordan , devel@lists.libvirt.org, Mads Ynddal , Elena Ufimtseva , Peter Xu , Jason Herne , Michael Rolnik , Weiwei Li , Laurent Vivier , Ilya Leoshkevich , qemu-block@nongnu.org, Peter Maydell , Kostiantyn Kostiuk , Kyle Evans , David Hildenbrand , "Edgar E. Iglesias" , Warner Losh , Daniel Henrique Barboza , John Snow , Yoshinori Sato , Aleksandar Rikalo , Alistair Francis , Marcelo Tosatti , Yonggang Luo , Radoslaw Biernacki , Artyom Tarasenko , Yanan Wang , Eduardo Habkost , Aurelien Jarno , Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , "Michael S. Tsirkin" , Ani Sinha , Roman Bolshakov , Manos Pitsidianakis , Chinmay Rath , Thomas Huth , Cleber Rosa , kvm@vger.kernel.org, Song Gao , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Eric Farman , Palmer Dabbelt , Leif Lindholm , Christian Borntraeger , Michael Roth , Mauro Carvalho Chehab , Jiaxun Yang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Mark Cave-Ayland , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Nicholas Piggin , John Levon , Pierrick Bouvier Subject: [PATCH v2 016/281] tests/functional/meson.build: Allow tests to reside in subfolders Date: Thu, 4 Sep 2025 09:06:50 +0100 Message-ID: <20250904081128.1942269-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250904081128.1942269-1-alex.bennee@linaro.org> References: <20250904081128.1942269-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x535.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org 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 Message-ID: <20250819112403.432587-5-thuth@redhat.com> --- 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'] foreach test : target_tests testname = '@0@-@1@'.format(target_base, test) - testfile = 'test_' + test + '.py' + if fs.exists('test_' + test + '.py') + testfile = 'test_' + test + '.py' + elif fs.exists('generic' / 'test_' + test + '.py') + testfile = 'generic' / 'test_' + test + '.py' + else + testfile = target_base / 'test_' + test + '.py' + endif testpath = meson.current_source_dir() / testfile teststamp = testname + '.tstamp' test_precache_env = environment() -- 2.47.2