From nobody Mon Feb 9 16:34:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636388272; cv=none; d=zohomail.com; s=zohoarc; b=c8raOsVsLSmlfV48Ilxukw86bFow9gzwp42U+ft1rxg+uk8OtQ+boLs7YmcCvwoRT6EKWe+nPY0Tihr70AooUXC06UwX+UKFXqo3CSwhKfDcZs4/Pmj+gPE3nERW2LWzorfDs/CAnYBxorr2ZQ3KTYzNZkVLoftkTZMYzSbxoIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388272; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GMrdeSiQ+KnelF2GFHW2ZMeVD2G2lXREHtMKu/SnDtA=; b=jZjM30pC5ez8NzKiine2LyBqPSWMGtTc+PrziZ/mdw67rYiQ9UvM4j0IxqGK1eCrYZWmO6clv/pyiCW82cNvoSyxJAkK2bSTgnD1T9mRY2H9c47J/052LM9OJdJtbsaxNpj6Qg85PjFUH0goNhBzXqPGiWU8SkFjx22/B6Q73nU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1636388272092365.1708939766445; Mon, 8 Nov 2021 08:17:52 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-92-BlPiDmHKOzSYVNd8nqUPng-1; Mon, 08 Nov 2021 11:17:49 -0500 Received: by mail-wm1-f72.google.com with SMTP id m18-20020a05600c3b1200b0033283ea5facso41216wms.1 for ; Mon, 08 Nov 2021 08:17:48 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (46.red-193-152-127.dynamicip.rima-tde.net. [193.152.127.46]) by smtp.gmail.com with ESMTPSA id k27sm18495352wms.41.2021.11.08.08.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388270; 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=GMrdeSiQ+KnelF2GFHW2ZMeVD2G2lXREHtMKu/SnDtA=; b=LUdXRdVDnRrAcBmqM4snYxwNAgjJWRnHEzaaoQFEggCcVPOdb6cR0M00Rd0+I9Z1P9aQoq KP6pFufzF16L3HoJB7zT9QH8MgOB7y07kZv58c9qndBk9uZ4PSCi1+s65fWLTNr1MO2iqr 27wl56GqKaJWJ0jeNMnZMr0nw9XHGzc= X-MC-Unique: BlPiDmHKOzSYVNd8nqUPng-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GMrdeSiQ+KnelF2GFHW2ZMeVD2G2lXREHtMKu/SnDtA=; b=z0JB5+S33ZzgilroTevVlTue3/kOKzQeUjf+5QPydaukCJxzWb6Nfyf/I9fD2H1S63 6sAsOi2+H+D+0d62eo+pft8wkfvS+1CVm9vn029o6SE6oR4a1dPN2gZwKDKnVrhFBxGH wnyrhmkFFZHNYaZftgrVPkOT/gC/aH9qLHC6qyHFpd0+OQ7TdIlPu9V3r0Du94n2UWIE ZwyuqA94UFAMzqUcSF7OWS3FU7PNMThSbLuqgGSL1drLLMJ+GL4n6CTgvMzUAuMxpXsY U9RyTwrLkK9jqjQxZtxLxsEMb8GqtDUhMKWUoE80qsvMny4MMsWKt6+A0geG5SX6K+Dv eE7w== X-Gm-Message-State: AOAM531TdFAs7q/lDrQro5Qah0Rz/QB4OaknDlf6c980hULVxFspA5+c 4kID0KIlmXrKo2pHq64WZXvoss+9iSMVDuXgYg8ibdG9zFqmXlrOQFzS8RUwtX+Bnz4cuvk3cB+ W1iOekx5hSeMfmw== X-Received: by 2002:a5d:6ac7:: with SMTP id u7mr369570wrw.57.1636388267821; Mon, 08 Nov 2021 08:17:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvVljzw7CoKR/6g57sl6SdgMoMMrt2eZxDXfOxEgf5BENMlf9CYZKsABjke6mNuASq9QySLA== X-Received: by 2002:a5d:6ac7:: with SMTP id u7mr369539wrw.57.1636388267641; Mon, 08 Nov 2021 08:17:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 1/9] tests/acceptance: introduce new check-avocado target Date: Mon, 8 Nov 2021 17:17:31 +0100 Message-Id: <20211108161739.1371503-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211108161739.1371503-1-philmd@redhat.com> References: <20211108161739.1371503-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636388275570100001 From: Willian Rampazzo This introduces a new `make` target, `check-avocado`, and adds a deprecation message about the `check-acceptance` target. This is a preparation for renaming the `tests/acceptance` folder to `tests/avocado`. The plan is to remove the call to the `check-avocado` target one or two months after the release and leave the warning to force people to move to the new `check-avocado` target. Later, the `check-acceptance` target can be removed. The intent is to avoid a direct impact during the current soft freeze. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Thomas Huth Message-Id: <20211105155354.154864-2-willianr@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/Makefile.include | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 8434a33fe68..8e8ee584933 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -16,7 +16,7 @@ ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" endif - @echo " $(MAKE) check-acceptance Run acceptance (functional) tests fo= r currently configured targets" + @echo " $(MAKE) check-avocado Run avocado (integration) tests for = currently configured targets" @echo @echo " $(MAKE) check-report.tap Generates an aggregated TAP test rep= ort" @echo " $(MAKE) check-venv Creates a Python venv for tests" @@ -24,7 +24,7 @@ endif @echo @echo "The following are useful for CI builds" @echo " $(MAKE) check-build Build most test binaris" - @echo " $(MAKE) get-vm-images Downloads all images used by accepta= nce tests, according to configured targets (~350 MB each, 1.5 GB max)" + @echo " $(MAKE) get-vm-images Downloads all images used by avocado= tests, according to configured targets (~350 MB each, 1.5 GB max)" @echo @echo @echo "The variable SPEED can be set to control the gtester speed setting= ." @@ -83,7 +83,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 # Python venv for running tests =20 -.PHONY: check-venv check-acceptance +.PHONY: check-venv check-avocado check-acceptance check-acceptance-depreca= ted-warning =20 TESTS_VENV_DIR=3D$(BUILD_DIR)/tests/venv TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt @@ -127,12 +127,12 @@ get-vm-image-fedora-31-%: check-venv $(call quiet-command, \ $(TESTS_VENV_DIR)/bin/python -m avocado vmimage get \ --distro=3Dfedora --distro-version=3D31 --arch=3D$*, \ - "AVOCADO", "Downloading acceptance tests VM image for $*") + "AVOCADO", "Downloading avocado tests VM image for $*") =20 # download all vm images, according to defined targets get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%, $(FEDORA_= 31_DOWNLOAD)) =20 -check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images +check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images $(call quiet-command, \ $(TESTS_VENV_DIR)/bin/python -m avocado \ --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ @@ -142,6 +142,13 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-= vm-images $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \ "AVOCADO", "tests/acceptance") =20 +check-acceptance-deprecated-warning: + @echo + @echo "Note '$(MAKE) check-acceptance' is deprecated, use '$(MAKE) check-= avocado' instead." + @echo + +check-acceptance: check-acceptance-deprecated-warning | check-avocado + # Consolidated targets =20 .PHONY: check-block check check-clean get-vm-images --=20 2.31.1