From nobody Mon Feb 9 08:10:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1632762222; cv=none; d=zohomail.com; s=zohoarc; b=d3Qssdp0pVvGccd1hqHHY7QLUHuLikQ/4/2LtS6dDa0yXdEFqAMNuAp15rSzM63oiT1ACxufZWG2lmYmZMGlrmh0XH1ndvOINdOf+X8T7COIbnSlMZMnrAqQFdJCJX80FSmW5SM/pgupBZOWHFhq3e56G6VK2vq7B+xYOP6W87o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632762222; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=vgeLl83LUv4CVvYnrCBYDZZxrjbLUE14bcfIj+YK0Kw=; b=irSnFYHfNg1GQJ8r8PMVajN/COXj3z+nZENAymQejPOqBPtMpb/u0vPBx+ymDa5WjfUZ7QKurDa6eXH3IIyddcu+pxxquaLh2YzlMYA3AgKgZprn5o/mKVLPA0P81nilvyMnSz189+vvDFVYZYkwmu8kQYAdxErGOxZbb8ws97c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632762222556253.94611979714682; Mon, 27 Sep 2021 10:03:42 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-367--tbeV9LDPzmXuslr9GugTw-1; Mon, 27 Sep 2021 13:03:38 -0400 Received: by mail-wr1-f69.google.com with SMTP id k2-20020adfc702000000b0016006b2da9bso14317138wrg.1 for ; Mon, 27 Sep 2021 10:03:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id u5sm18576902wrg.57.2021.09.27.10.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 10:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632762221; 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=vgeLl83LUv4CVvYnrCBYDZZxrjbLUE14bcfIj+YK0Kw=; b=SA8iJcJM/z1ITcH/CnW1dnktJsVmr14loEkABcc+vpE3RbMlaDdl0zxNAb+VukvBtEZSwo L0ypLMs/lCSx0dyFGRwxMCjwqC8+jyMtGP7mbM7mthH7dRg8Vy1us3f87tbAvX2HtcHk+C 6xNu1Nze0uXx4dFQdDjcThZaU2rZoWw= X-MC-Unique: -tbeV9LDPzmXuslr9GugTw-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=vgeLl83LUv4CVvYnrCBYDZZxrjbLUE14bcfIj+YK0Kw=; b=POBFlNkAbbNuxgjkMmMu7DihcuEcBcq85blzO4SHePL6wV9gisF4fI6NV1QfvHkl04 msrRne7f8jIq7o8oGWfXsKZ+teae8Nc3WC7rN/dep8xefTlx5OiY/xZw9MPkNBLrhK5P ZWZpa0gpSmPuxEb9L5YsAgIUsTSpHU7p8Cp2q5UQcvoKTbhfRw8Ks2RVVE2Bbu6t6DPX nMaTVRLQokrDzaJ5bA7s7qlCjp3pPnjVavkr9imudES6un1T4xyustBsblZL1S6LffmG m3XvtiLfx1xZKWhtmtu4n93BgppnkpEAWkgux6QdCmMntXN8M90uO8iGly2iW2sW1yb5 liRA== X-Gm-Message-State: AOAM532D85Fl67atPVrdIHx1SwtpI2Pq7z0MfLp2dimXQxpOWdWAnOO9 873VJDLosZcmLp5mKFwDtBiE1U+TFcqLV/rNdv3HANFtGSztg70chMKE2+IR+zclMT2JcfnDuL1 oNSjUsrrGwZaiVA== X-Received: by 2002:a5d:47a4:: with SMTP id 4mr1090764wrb.274.1632762216600; Mon, 27 Sep 2021 10:03:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+OwjWfoekY1VQfr9O1kNEpxkhgyRUbg4RaZUUeavoYB3slCDNxHm7H0iyO9nKlFtWH5tXQA== X-Received: by 2002:a5d:47a4:: with SMTP id 4mr1090734wrb.274.1632762216371; Mon, 27 Sep 2021 10:03:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Willian Rampazzo , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 15/21] tests/Makefile: add AVOCADO_TESTS option to make check-acceptance Date: Mon, 27 Sep 2021 19:02:21 +0200 Message-Id: <20210927170227.2014482-16-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927170227.2014482-1-philmd@redhat.com> References: <20210927170227.2014482-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: 1632762223713100001 From: Willian Rampazzo Add the possibility of running all the tests from a single file, or multiple files, running a single test within a file or multiple tests within multiple files using `make check-acceptance` and the AVOCADO_TESTS environment variable. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210923161141.232208-4-willianr@redhat.com> --- docs/devel/testing.rst | 27 +++++++++++++++++++++++++++ tests/Makefile.include | 5 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index c9f6b97f876..64c97447956 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -746,6 +746,33 @@ tags, see: =20 https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/t= ags.html =20 +To run a single test file, a couple of them, or a test within a file +using the ``make check-acceptance`` command, set the ``AVOCADO_TESTS`` +environment variable with the test files or test names. To run all +tests from a single file, use: + + .. code:: + + make check-acceptance AVOCADO_TESTS=3D$FILEPATH + +The same is valid to run tests from multiple test files: + + .. code:: + + make check-acceptance AVOCADO_TESTS=3D'$FILEPATH1 $FILEPATH2' + +To run a single test within a file, use: + + .. code:: + + make check-acceptance AVOCADO_TESTS=3D$FILEPATH:$TESTCLASS.$TESTNAME + +The same is valid to run single tests from multiple test files: + + .. code:: + + make check-acceptance AVOCADO_TESTS=3D'$FILEPATH1:$TESTCLASS1.$TESTNAME1= $FILEPATH2:$TESTCLASS2.$TESTNAME2' + The scripts installed inside the virtual environment may be used without an "activation". For instance, the Avocado test runner may be invoked by running: diff --git a/tests/Makefile.include b/tests/Makefile.include index f6484e5b31d..e69c4fae53e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -88,6 +88,9 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) TESTS_VENV_DIR=3D$(BUILD_DIR)/tests/venv TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results +ifndef AVOCADO_TESTS + AVOCADO_TESTS=3Dtests/acceptance +endif # Controls the output generated by Avocado when running tests. # Any number of command separated loggers are accepted. For more # information please refer to "avocado --help". @@ -136,7 +139,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images $(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \ --filter-by-tags-include-empty-key) \ $(AVOCADO_CMDLINE_TAGS) \ - $(if $(GITLAB_CI),,--failfast) tests/acceptance, \ + $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \ "AVOCADO", "tests/acceptance") =20 # Consolidated targets --=20 2.31.1