From nobody Fri Apr 26 19:22:02 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1674253096; cv=none; d=zohomail.com; s=zohoarc; b=dvo/u19d8cJR2ZHmA3uLwYXk0QveT+N7yh3X3DinxcwwkvQeBxxaVpYbffWjwxam6iQ1nqxr9XNeygqcShD7ZrIL5I+/uANdqasogXpbCUrdYriL5iNTDZIf4aZuixoVdudZxWmhTOq+u/dP8qGX9a6ViNpQkPdayE4vBZrAAxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674253096; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZoaSAQghUA4A5BJwi7VckEZenr6FJ88giTsaofH5gIw=; b=REjqp/qntvdax6EpliJnphfJ0RmuXvwaCo9vuW9AI6YVZ0b5o+y5LpYyravc3flgSAYxdbYoheWsDnVlZ+YqXPfg0KAEYzsbUogFmY8ndy0at+EoXgBUYthbLtMng5E7iXu7nmkMd4s8m9t+Vc9r0B1FKqTYApTPaXQmtxVpsbw= 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+importer2=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 1674253096353554.0523253901697; Fri, 20 Jan 2023 14:18:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIzhD-0005Zl-NJ; Fri, 20 Jan 2023 17:17:15 -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 1pIzhA-0005ZL-GY for qemu-devel@nongnu.org; Fri, 20 Jan 2023 17:17:12 -0500 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIzh8-000797-4H for qemu-devel@nongnu.org; Fri, 20 Jan 2023 17:17:11 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DFB195CA28; Fri, 20 Jan 2023 22:17:06 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0743513251; Fri, 20 Jan 2023 22:17:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 6PB0L+ASy2P6RwAAMHmgww (envelope-from ); Fri, 20 Jan 2023 22:17:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1674253026; h=from:from:reply-to: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=ZoaSAQghUA4A5BJwi7VckEZenr6FJ88giTsaofH5gIw=; b=aUqZSu9+kgx3sr2e0rDNB3u16jfpLt43GqrjkZGKb2BgQw2Ezr/asaY/3FpoGB8MupmzFJ 8TmH9h0WlUQTvPiY4ktfq5KAq6wnn8P26CDurBOdCsyU50EzCVeu7HmFm//a4A814S5TCQ JlAXcHab2BmpEK1FOzUcaYxFUipSPCs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1674253026; h=from:from:reply-to: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=ZoaSAQghUA4A5BJwi7VckEZenr6FJ88giTsaofH5gIw=; b=KM0ifDVR6otteA64w8lysyB/SkxsHNg/qZBsBXHBFBRTpi69jNki3HzsavCKnJnyrDd8uP pUCkJerdKIyYJDCg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , Daniel Henrique Barboza , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] tests/avocado: Invert parameter vs. tag precedence during setUp Date: Fri, 20 Jan 2023 19:14:59 -0300 Message-Id: <20230120221500.4194-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230120221500.4194-1-farosas@suse.de> References: <20230120221500.4194-1-farosas@suse.de> MIME-Version: 1.0 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:67c:2178:6::1d; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1674253097396100002 Content-Type: text/plain; charset="utf-8" We currently never pass parameters to the avocado process via Makefile. To start doing so we need to invert the precedence between command line parameters and tags, otherwise a command line parameter would override values for all the tests, which is unlikely to be a common use-case. A more likely use-case is to force certain values for the tests that have no tags. For instance, if a test has no 'arch' tags and therefore can run for all targets, one could possibly force it to run on a certain target with an arch=3Dfoo parameter. This applies to the variables set during setUp(): arch, machine, cpu, distro_name, distro_version. Parameters used directly in tests or read via self.params.get are left unchanged. Signed-off-by: Fabiano Rosas Reviewed-by: Daniel Henrique Barboza --- tests/avocado/avocado_qemu/__init__.py | 32 +++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 910f3ba1ea..a181cac383 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -240,12 +240,23 @@ def _get_unique_tag_val(self, tag_name): return vals.pop() return None =20 + def _get_prop(self, name): + """ + Infer test properties based on tags. If no tag is present, + look for a command line parameter of the same name. + """ + val =3D self._get_unique_tag_val(name) + if not val: + # If there's no tag, look for a command line + # parameter. This allows the user to override any defaults + # the caller of this function would choose if we were to + # return None. + val =3D self.params.get(name) + return val + def setUp(self, bin_prefix): - self.arch =3D self.params.get('arch', - default=3Dself._get_unique_tag_val('ar= ch')) - - self.cpu =3D self.params.get('cpu', - default=3Dself._get_unique_tag_val('cpu= ')) + self.arch =3D self._get_prop('arch') + self.cpu =3D self._get_prop('cpu') =20 default_qemu_bin =3D pick_default_qemu_bin(bin_prefix, arch=3Dself= .arch) self.qemu_bin =3D self.params.get('qemu_bin', @@ -274,8 +285,7 @@ def setUp(self): =20 super().setUp('qemu-system-') =20 - self.machine =3D self.params.get('machine', - default=3Dself._get_unique_tag_val(= 'machine')) + self.machine =3D self._get_prop('machine') =20 def require_accelerator(self, accelerator): """ @@ -529,15 +539,11 @@ class LinuxTest(LinuxSSHMixIn, QemuSystemTest): memory =3D '1024' =20 def _set_distro(self): - distro_name =3D self.params.get( - 'distro', - default=3Dself._get_unique_tag_val('distro')) + distro_name =3D self._get_prop('distro') if not distro_name: distro_name =3D 'fedora' =20 - distro_version =3D self.params.get( - 'distro_version', - default=3Dself._get_unique_tag_val('distro_version')) + distro_version =3D self._get_prop('distro_version') if not distro_version: distro_version =3D '31' =20 --=20 2.35.3 From nobody Fri Apr 26 19:22:02 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1674253103; cv=none; d=zohomail.com; s=zohoarc; b=aSuiUJlOxnO0fwn4RbUxNdir+2W0p6mTa9DMa+kKOp87cmI1VHArw4GuUEJlO//RwLUWs9lj9JSSYlI8VfHs8kxXIVKhdTLayjBkKRU5APhbV0FLVlXa4/oPRO8du3BgQPNj3jKWgEgnYm5vvlm8k9qWEzsvGE/bMlBJL6NZ5rE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674253103; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=702jP5ex4ZxJiqdr56IM9l5rrWzdFVZCbS0jspohVFU=; b=Gc5YrdNHPY2ZyZQh/oOvhgDNz5KMCTkTOpvRy69UBIJpmXd6Vv6opEjDBOWJhM2bGsLNFk611Tz073UiDfE2w6o7nkD/fI9+7X7kZAhYIeavPSP4IMFo9yFO2jUAkbX8UxOX4YD4nLPUN5NQK5gAW/8g1O0+ljdETHxypJXKJAo= 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+importer2=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 1674253103781554.9025765334524; Fri, 20 Jan 2023 14:18:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIzhI-0005aM-1g; Fri, 20 Jan 2023 17:17:20 -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 1pIzhE-0005a7-7e for qemu-devel@nongnu.org; Fri, 20 Jan 2023 17:17:16 -0500 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIzhA-00079L-Ed for qemu-devel@nongnu.org; Fri, 20 Jan 2023 17:17:14 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B785D3389B; Fri, 20 Jan 2023 22:17:09 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 604F113251; Fri, 20 Jan 2023 22:17:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QFCnCeMSy2P6RwAAMHmgww (envelope-from ); Fri, 20 Jan 2023 22:17:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1674253029; h=from:from:reply-to: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=702jP5ex4ZxJiqdr56IM9l5rrWzdFVZCbS0jspohVFU=; b=UJk+SN79X6Mi52SyPf4UIc+c9ZA0LQdqez5UlIZizDYu6G6CbPCKYkF+xl7APS/17EshBj wmzPg/A8tI/uWAk0iP1kbiiDa3KLLnnlhcKzHcOU0Iyo4zTs8wm+7CKE4A4DI68fpB84Hv k1G7LkUbSIm7gj5KuTIp6vbZTWKV+VQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1674253029; h=from:from:reply-to: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=702jP5ex4ZxJiqdr56IM9l5rrWzdFVZCbS0jspohVFU=; b=szGqJxZ7M3x6lOVYRVsyQ8rEbPxKinM3DNNlBAsLd3IsuA5T1iF1jQIuy3I5jX2nZNpPRZ x4vVGcZc3mQRQKAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth Subject: [PATCH 2/2] tests/avocado: Allow passing command line parameters via Makefile Date: Fri, 20 Jan 2023 19:15:00 -0300 Message-Id: <20230120221500.4194-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230120221500.4194-1-farosas@suse.de> References: <20230120221500.4194-1-farosas@suse.de> MIME-Version: 1.0 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1674253105474100003 Content-Type: text/plain; charset="utf-8" Add support for the 'avocado run' "-p" option, which allows us to pass parameters in the form key=3Dvalue to be applied to all tests selected for a given run. This is useful to force generic tests to use a specific machine, cpu or qemu-binary where otherwise the defaults would be used. E.g.: $ make check-avocado AVOCADO_PARAMS=3D"machine=3Dvirt arch=3Driscv64" Signed-off-by: Fabiano Rosas Reviewed-by: Daniel Henrique Barboza --- tests/Makefile.include | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9422ddaece..f92e730aa0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -107,6 +107,10 @@ else AVOCADO_CMDLINE_TAGS=3D$(addprefix -t , $(AVOCADO_TAGS)) endif =20 +ifdef AVOCADO_PARAMS + AVOCADO_CMDLINE_PARAMS=3D$(addprefix -p , $(AVOCADO_PARAMS)) +endif + quiet-venv-pip =3D $(quiet-@)$(call quiet-command-run, \ $(TESTS_PYTHON) -m pip -q --disable-pip-version-check $1, \ "VENVPIP","$1") @@ -144,7 +148,7 @@ check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-i= mages --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ $(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \ --filter-by-tags-include-empty-key) \ - $(AVOCADO_CMDLINE_TAGS) \ + $(AVOCADO_CMDLINE_TAGS) $(AVOCADO_CMDLINE_PARAMS) \ $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \ "AVOCADO", "tests/avocado") =20 --=20 2.35.3