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 24D51CE8D6B for ; Mon, 17 Nov 2025 18:53:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL4LP-0002qb-2R; Mon, 17 Nov 2025 13:52:58 -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 1vL4Kg-0002gi-CM for qemu-devel@nongnu.org; Mon, 17 Nov 2025 13:52:14 -0500 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 1vL4Kb-00086w-Tl for qemu-devel@nongnu.org; Mon, 17 Nov 2025 13:52:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763405524; 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=XA7Vm5KZR2hzoQwq7fmaOwDr5HEgc5OgsKtW3ZtVkCY=; b=C/HmoGVrwurJzTFqTDu0pTBrPwfj5ztUkh/4uV3Qb5lz0KUzdRvt+7nObrB4tDPtLcsKVT ey1zOGJDpQkKdfDtA+sf3XCOv45j4S+Ropv/Hgiyn9NeLbNFkQWI61lTsm6EVEgfRplTpM JwjGJZ5Ano9KIUZcf0xP7igabCnkcxM= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-230-sweumFZeNUWUKcCVeZ4taw-1; Mon, 17 Nov 2025 13:52:00 -0500 X-MC-Unique: sweumFZeNUWUKcCVeZ4taw-1 X-Mimecast-MFC-AGG-ID: sweumFZeNUWUKcCVeZ4taw_1763405519 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B40D818001D1; Mon, 17 Nov 2025 18:51:59 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.81.70]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 82B8D180047F; Mon, 17 Nov 2025 18:51:56 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Thomas Huth , Michael Roth , Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Markus Armbruster , John Snow Subject: [PATCH 08/22] meson, mkvenv: add checktests and functests custom targets Date: Mon, 17 Nov 2025 13:51:16 -0500 Message-ID: <20251117185131.953681-9-jsnow@redhat.com> In-Reply-To: <20251117185131.953681-1-jsnow@redhat.com> References: <20251117185131.953681-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@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_H3=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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org add "pyvenv_checktests_group" and "pyvenv_functests_group" targets to meson. These targets will invoke mkvenv.py to install the associated dependency group to the build/pyvenv directory. Signed-off-by: John Snow --- meson.build | 1 + pyvenv/meson.build | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pyvenv/meson.build diff --git a/meson.build b/meson.build index df4460035c3..0e9c73dc2a0 100644 --- a/meson.build +++ b/meson.build @@ -4585,6 +4585,7 @@ subdir('scripts') subdir('tools') subdir('pc-bios') subdir('docs') +subdir('pyvenv') # Tests are disabled on emscripten because they rely on host features that aren't # supported by emscripten (e.g. fork and unix socket). if host_os != 'emscripten' diff --git a/pyvenv/meson.build b/pyvenv/meson.build new file mode 100644 index 00000000000..6631caf9b7a --- /dev/null +++ b/pyvenv/meson.build @@ -0,0 +1,34 @@ +# Note that this file only controls "optional" dependency groups; groups +# *required* for the build are handled directly in configure instead: +# namely, meson and sphinx. + +pyvenv_common_deps = files( + meson.project_source_root() + '/pythondeps.toml', + meson.project_source_root() + '/python/scripts/mkvenv.py' +) +pyvenv_wheel_dir = meson.project_source_root() + '/python/wheels' + + +pyvenv_checktests_group = custom_target( + 'pyvenv_checktests_group', + output: 'checktests.group', + input: pyvenv_common_deps, + command: [ python, '@INPUT1@', + 'ensuregroup', + '--dir', pyvenv_wheel_dir, + '@INPUT0@', + 'checktests' ], +) + + +pyvenv_functests_group = custom_target( + 'pyvenv_functests_group', + output: 'functests.group', + input: pyvenv_common_deps, + depends: pyvenv_checktests_group, + command: [ python, '@INPUT1@', + 'ensuregroup', + '--dir', pyvenv_wheel_dir, + '@INPUT0@', + 'functests' ], +) -- 2.51.1