From nobody Fri May 17 05:54:40 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1625671561; cv=none; d=zohomail.com; s=zohoarc; b=B9v7kWXk2w8ucyywXghnuCRGNAWcCywRdkkh8stlvq0Iaxee0wXw5lFBH5SQeZPUGwY1eBV9L0sjsFh3D0VQ6yqmnHg3lUrCrC6np6hcJV7WdSSXk286EJ1zHQ8X2McGw7wptxjtFikJcFGXj10vX5pJoOHiFOlK0a83sxJSyhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625671561; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Cf4wx6ApY9ZhvhbAGr6o8CDySPylQF+sFGUKb7JfC2w=; b=atnr4dcLNcgc5H5uOpmbZNBwp5iTX+CAJ3AQxBhaUURU1gzqMTQfAK/nM86HTZtE60kfV9h2PZrRs3n0Ca6fVnbkdy2XtxWVjGtDgtPfc6qmAlXsDJdxg8m6NrrUR5UL5mef7dhcKok8fyDzirXDItS7XA3brew+l7RpmbL1uYE= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625671561210558.2040150327591; Wed, 7 Jul 2021 08:26:01 -0700 (PDT) Received: from localhost ([::1]:38492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m19R1-0005YO-B1 for importer@patchew.org; Wed, 07 Jul 2021 11:25:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m19QI-0004th-1A for qemu-devel@nongnu.org; Wed, 07 Jul 2021 11:25:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58981) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m19QC-0000cY-Sr for qemu-devel@nongnu.org; Wed, 07 Jul 2021 11:25:11 -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-329-60liiH3DObWPe-WtSkr7-Q-1; Wed, 07 Jul 2021 11:25:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9B1E100CA88; Wed, 7 Jul 2021 15:25:04 +0000 (UTC) Received: from wrampazz.redhat.com (ovpn-113-218.rdu2.redhat.com [10.10.113.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 667431017CE5; Wed, 7 Jul 2021 15:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625671506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cf4wx6ApY9ZhvhbAGr6o8CDySPylQF+sFGUKb7JfC2w=; b=NMB4IlZl91FfP7NOYOn0zbqlJ1YXgGgMJ3LLxwLVaC84Jobaw2kqF5znVLFr2IMgPHYjfH w12W/iKIT2WNCiSO8t734BcxeDQyxwqA7PO3bvVl8K+EMqBZmn8K+MRas2Uv+AVmTi+GER 009LivIUlqocIJTjbg41nvSmEHTZkP0= X-MC-Unique: 60liiH3DObWPe-WtSkr7-Q-1 From: Willian Rampazzo To: alex.bennee@linaro.org, qemu-devel@nongnu.org, thuth@redhat.com, wainersm@redhat.com, crosa@redhat.com, philmd@redhat.com, f4bug@amsat.org Subject: [PATCH v2] tests/acceptance: allow control over tags during check-acceptance Date: Wed, 7 Jul 2021 12:24:54 -0300 Message-Id: <20210707152454.246519-1-willianr@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=216.205.24.124; envelope-from=willianr@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.439, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1625671562499100001 Content-Type: text/plain; charset="utf-8" Although it is possible to run a specific test using the avocado command-line, a user may want to use a specific tag while running the ``make check-acceptance`` during the development or debugging. This allows using the AVOCADO_TAGS environment variable where the user takes total control of which tests should run based on the tags defined. This also makes the check-acceptance command flexible to restrict tests based on tags while running on CI. e.g.: AVOCADO_TAGS=3D"foo bar baz" make check-acceptance Signed-off-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Tested-by: Wainer dos Santos Moschetta --- docs/devel/testing.rst | 8 ++++++++ tests/Makefile.include | 12 +++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 4e42392810..f6e4fc08a7 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -760,6 +760,14 @@ in the current directory, tagged as "quick", run: =20 avocado run -t quick . =20 +It is also possible to run tests based on tags using the +``make check-acceptance`` command and the ``AVOCADO_TAGS`` environment +variable: + +.. code:: + + AVOCADO_TAGS=3Dquick make check-acceptance + The ``avocado_qemu.Test`` base test class ----------------------------------------- =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index 8f220e15d1..d464f06e4a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -92,7 +92,12 @@ TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results # Any number of command separated loggers are accepted. For more # information please refer to "avocado --help". AVOCADO_SHOW=3Dapp -AVOCADO_TAGS=3D$(patsubst %-softmmu,-t arch:%, $(filter %-softmmu,$(TARGET= S))) +ifndef AVOCADO_TAGS + AVOCADO_CMDLINE_TAGS=3D$(patsubst %-softmmu,-t arch:%, \ + $(filter %-softmmu,$(TARGETS))) +else + AVOCADO_CMDLINE_TAGS=3D$(addprefix -t , $(AVOCADO_TAGS)) +endif =20 $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) $(call quiet-command, \ @@ -128,8 +133,9 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images $(call quiet-command, \ $(TESTS_VENV_DIR)/bin/python -m avocado \ --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 $(AVOCADO_TAGS),, --filter-by-tags-include-empty \ + --filter-by-tags-include-empty-key) \ + $(AVOCADO_CMDLINE_TAGS) \ $(if $(GITLAB_CI),,--failfast) tests/acceptance, \ "AVOCADO", "tests/acceptance") =20 --=20 2.31.1