From nobody Mon Feb 9 12:43:12 2026 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=1764043390; cv=none; d=zohomail.com; s=zohoarc; b=cDHeSL6QE0BH1DFKqrez9gxeGAXHg8V9p4q9q3gWi3NeZ51v0N9eu+wkOSo0Xfh475/fEYZamp5sV3MhKaldhfzL/u7XEMXeJklFeiLk+3oa+HTpp5WucnuOsfXQKw8n4nvM53b1YsJTC6Y7Vyz9qV0e0VIRjtm8ad5DTo98oYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764043390; 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=9JGRrGpz2pf8T+gKW6OqS0q3yHMVYsD/ap0BLe9xBqQ=; b=hoNI8MPpel3iCAzo4JySUb2RXzbvLzCgN0ES6cGS/1ivP+ALh/jOufn9M/w90pg9CWeebfpRorvfHZdNWx92bYsc80Kj0p5cVfaUbA0/N9I7tUcJJkX878/TBaM9fFN//xv5VZ6I7NUmWE96+c2ua/IWm6VijglVXHD0NfisXvQ= 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 1764043390542286.6039267476132; Mon, 24 Nov 2025 20:03:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNkGK-0005PX-PI; Mon, 24 Nov 2025 23:02:44 -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 1vNkFE-0003RB-3D for qemu-devel@nongnu.org; Mon, 24 Nov 2025 23:01:39 -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 1vNkFA-0006bv-7S for qemu-devel@nongnu.org; Mon, 24 Nov 2025 23:01:34 -0500 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-427-4KnuDQywNUCwMMCyVbGZjA-1; Mon, 24 Nov 2025 23:01:26 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 AF11F180009D; Tue, 25 Nov 2025 04:01:25 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BB7EF1800451; Tue, 25 Nov 2025 04:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764043291; 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=9JGRrGpz2pf8T+gKW6OqS0q3yHMVYsD/ap0BLe9xBqQ=; b=RkKNmQRyYwRsmMBnO8LKm2fhWJVwTGec/Hn1sLlLUHgVUEqTE97jJRwoqbtl/COwbfE7vT aiZMTyd9L7Vs4oNCHQevZOszN+wvSbzgtypL1JxiPB7f4MjStjd3I9fQgvI+5UA9cdGcCm eBXkpokb+/WS9eB4c+Z1AFdZWd4uiVE= X-MC-Unique: 4KnuDQywNUCwMMCyVbGZjA-1 X-Mimecast-MFC-AGG-ID: 4KnuDQywNUCwMMCyVbGZjA_1764043285 From: John Snow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Markus Armbruster , Hanna Reitz , Thomas Huth , Michael Roth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cleber Rosa , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kevin Wolf , qemu-block@nongnu.org Subject: [PATCH v2 15/16] tests/Makefile: replace old "check-venv" target with meson target Date: Mon, 24 Nov 2025 23:00:43 -0500 Message-ID: <20251125040045.461148-16-jsnow@redhat.com> In-Reply-To: <20251125040045.461148-1-jsnow@redhat.com> References: <20251125040045.461148-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.075, 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=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: 1764043392386019200 Content-Type: text/plain; charset="utf-8" With new meson dependencies in place, swap the "check-venv" command to one that invokes the meson dependency system to ensure the appropriate testing dependencies are installed to the pyvenv. This command is not required when running "make check" as the meson dependency system is aware that it needs to install the testing deps to run that suite, however, for certain manual test invocations (device-crash-test, iotests when run manually) this make target serves as a convenient way to explicitly request those dependencies be added to the pyvenv. Note that this patch actually changes the meaning of check-venv slightly to how it has been operating in the past: this target now only installs the necessary patches to run "make check" and will no longer pull in dependencies for functional tests. This winds up being safe to do because the meson dependencies will handle functional tests satisfactorily; running "make check-functional" will pull in any additional dependencies needed to run that portion of the test suite on its own. Signed-off-by: John Snow --- tests/Makefile.include | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 40b114bd158..237d410ad83 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -83,33 +83,16 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) .PHONY: distclean-tcg distclean-tcg: $(DISTCLEAN_TCG_TARGET_RULES) =20 -# Python venv for running tests - -.PHONY: check-venv - # Build up our target list from the filtered list of ninja targets TARGETS=3D$(patsubst libqemu-%.a, %, $(filter libqemu-%.a, $(ninja-targets= ))) =20 -TESTS_VENV_TOKEN=3D$(BUILD_DIR)/pyvenv/tests.group - -quiet-venv-pip =3D $(quiet-@)$(call quiet-command-run, \ - $(PYTHON) -m pip -q --disable-pip-version-check $1, \ - "VENVPIP","$1") - -$(TESTS_VENV_TOKEN): $(SRC_PATH)/pythondeps.toml - $(call quiet-venv-pip,install -e "$(SRC_PATH)/python/") - $(MKVENV_ENSUREGROUP) $< checktests functests - $(call quiet-command, touch $@) - -check-venv: $(TESTS_VENV_TOKEN) - FUNCTIONAL_TARGETS=3D$(patsubst %-softmmu,check-functional-%, $(filter %-s= oftmmu,$(TARGETS))) .PHONY: $(FUNCTIONAL_TARGETS) -$(FUNCTIONAL_TARGETS): check-venv +$(FUNCTIONAL_TARGETS): @$(MAKE) SPEED=3Dthorough $(subst -functional,-func,$@) =20 .PHONY: check-functional -check-functional: check-venv +check-functional: @$(NINJA) precache-functional @$(PYTHON) $(SRC_PATH)/scripts/clean_functional_cache.py @QEMU_TEST_NO_DOWNLOAD=3D1 $(MAKE) SPEED=3Dthorough check-func check-func= -quick @@ -117,6 +100,10 @@ check-functional: check-venv .PHONY: check-func check-func-quick check-func check-func-quick: =20 +.PHONY: check-venv +check-venv: + @$(NINJA) pyvenv/checktests.group + # Consolidated targets =20 .PHONY: check check-clean --=20 2.51.1