From nobody Sat May 18 08:35:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632341324543917.3601785289492; Wed, 22 Sep 2021 13:08:44 -0700 (PDT) Received: from localhost ([::1]:44412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mT8Xq-0002GA-Rk for importer@patchew.org; Wed, 22 Sep 2021 16:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT8TG-0004Wy-Ez for qemu-devel@nongnu.org; Wed, 22 Sep 2021 16:04:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT8TF-0002cr-2X for qemu-devel@nongnu.org; Wed, 22 Sep 2021 16:03:58 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-128-DLISKzLYPeq-1Wfhv61kFw-1; Wed, 22 Sep 2021 16:03:55 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F1731084683; Wed, 22 Sep 2021 20:03:54 +0000 (UTC) Received: from wrampazz.redhat.com (unknown [10.22.32.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC0CD5F707; Wed, 22 Sep 2021 20:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632341036; 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=qyGv+jUkaiNZrkCbm48yg6N6bqxMZJ08FZ5CDm1k5KU=; b=LI52FJQAB5pjs26C6nDLmgRAdSmn+PgJldO8IRhxi2vt4Gl0thi3nQiSqs/99lvyTZQjMK 7dARh7lYln5P6hpNKZFep1sYquyfLU+EYrtGhIb8l0nlz2ABn/ghLwPHZ1/pOUlqZvXrJX bLPtFicgPTfjJHpQl+MSLmlSYao0zSQ= X-MC-Unique: DLISKzLYPeq-1Wfhv61kFw-1 From: Willian Rampazzo To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] docs/devel/testing: add instruction to run a single acceptance test Date: Wed, 22 Sep 2021 17:03:39 -0300 Message-Id: <20210922200340.196329-2-willianr@redhat.com> In-Reply-To: <20210922200340.196329-1-willianr@redhat.com> References: <20210922200340.196329-1-willianr@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=willianr@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=willianr@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.472, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1632341325439100001 Content-Type: text/plain; charset="utf-8" Add instructions to the Acceptance tests section about running a single test file or a test within the test file. Signed-off-by: Willian Rampazzo --- docs/devel/testing.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 4a0abbf23d..b03df34f7b 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -740,6 +740,20 @@ may be invoked by running: =20 tests/venv/bin/avocado run $OPTION1 $OPTION2 tests/acceptance/ =20 +It is also possible to run tests from a single file or a single test +within a test file. To run tests from a single file within the build +tree, use: + + .. code:: + + tests/venv/bin/avocado run tests/acceptance/$TESTFILE + +To run a single test within a test file, use: + + .. code:: + + tests/venv/bin/avocado run tests/acceptance/$TESTFILE:$TESTCLASS.$TESTNA= ME + Manual Installation ------------------- =20 --=20 2.31.1 From nobody Sat May 18 08:35:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632341190789151.4242422798136; Wed, 22 Sep 2021 13:06:30 -0700 (PDT) Received: from localhost ([::1]:38406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mT8Vf-0006CH-VB for importer@patchew.org; Wed, 22 Sep 2021 16:06:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT8TJ-0004XF-Ud for qemu-devel@nongnu.org; Wed, 22 Sep 2021 16:04:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT8TI-0002fr-9S for qemu-devel@nongnu.org; Wed, 22 Sep 2021 16:04:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-426-D7DZQpH-P82nw-kqkNTCkg-1; Wed, 22 Sep 2021 16:03:58 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 924DB1084683; Wed, 22 Sep 2021 20:03:57 +0000 (UTC) Received: from wrampazz.redhat.com (unknown [10.22.32.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF4D25FC13; Wed, 22 Sep 2021 20:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632341039; 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=z7eUxZMWqOun4Q8F6UnI4Akbp+ROQcsXpU69uwoV17c=; b=VRUbBi0j3OjRPWZhrH4FzAqFWYdo8niNAvrtgJ36OQCBQQsvs6JgTBIbGI2NaOuKO8TRRK wHYNSZl/FkT1zGpkFG9E45AsvL4HosiyF8r69yNhI4vwx6lv81sD11sEWJwJdxrU9ZB97y 7TSl4YxJjdfqfvvsrslYpkRvB4B4ULU= X-MC-Unique: D7DZQpH-P82nw-kqkNTCkg-1 From: Willian Rampazzo To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] tests/Makefile: add AVOCADO_TEST_FILES option to make check-acceptance Date: Wed, 22 Sep 2021 17:03:40 -0300 Message-Id: <20210922200340.196329-3-willianr@redhat.com> In-Reply-To: <20210922200340.196329-1-willianr@redhat.com> References: <20210922200340.196329-1-willianr@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=willianr@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=willianr@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.472, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1632341191294100003 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_TEST_FILES environment variable. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Willian Rampazzo --- 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 b03df34f7b..785f82fc65 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -732,6 +732,33 @@ available. On Debian and Ubuntu based systems, depend= ing on the specific version, they may be on packages named ``python3-venv`` and ``python3-pip``. =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_TEST_FILES`` +environment variable with the test files or test names. To run all +tests from a single file, use: + + .. code:: + + make check-acceptance AVOCADO_TEST_FILES=3D$FILEPATH + +The same is valid to run tests from multiple test files: + + .. code:: + + make check-acceptance AVOCADO_TEST_FILES=3D'$FILEPATH1 $FILEPATH2' + +To run a single test within a file, use: + + .. code:: + + make check-acceptance AVOCADO_TEST_FILES=3D$FILEPATH:$TESTCLASS.$TESTNAME + +The same is valid to run single tests from multiple test files: + + .. code:: + + make check-acceptance AVOCADO_TEST_FILES=3D'$FILEPATH1:$TESTCLASS1.$TEST= NAME1 $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 6e16c05f10..1f1b4aa089 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_TEST_FILES + AVOCADO_TEST_FILES=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". @@ -130,7 +133,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ --filter-by-tags-include-empty --filter-by-tags-include-empty-= key \ $(AVOCADO_TAGS) \ - $(if $(GITLAB_CI),,--failfast) tests/acceptance, \ + $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TEST_FILES), \ "AVOCADO", "tests/acceptance") =20 # Consolidated targets --=20 2.31.1