From patchwork Fri Jul 19 15:13:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 813397 Delivered-To: patch@linaro.org Received: by 2002:adf:f288:0:b0:367:895a:4699 with SMTP id k8csp801971wro; Fri, 19 Jul 2024 08:13:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9Q0scB5/R6XadNZ7dRUuCwTSEBgzujrhUDbM4nIvrZ6Cyd7vQq34BOZflVqU+03peyzeYlvpJrkxnFJHsdYBG X-Google-Smtp-Source: AGHT+IFk5LLW18VXlPqS+r3/inW8ixmH8oyS+SSt5BytMORRKRX1MYp4CDMSbtP4uxSYvsPaw4sc X-Received: by 2002:a05:620a:f02:b0:79f:bd7:d24b with SMTP id af79cd13be357-7a1938ee214mr764267985a.7.1721402034528; Fri, 19 Jul 2024 08:13:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721402034; cv=none; d=google.com; s=arc-20160816; b=Qv7tSx+ikk3tGBKYVT8eSunGIHH0Hepx1aPtmsReqzjS2trZuRs9A3c/4L7BnB3ZjZ noP5xKaqk9aS6Y9nLHjxFVrbg5AU7AkAFRMPERYmDpoeiAIrsRS5qOr6sVpDG6hKJ/I2 jFFZIU3prMWxLPN3sxWmIgqaykFNoCi+zxJypfa+B+lqjrNheaQaqZAzMLyQgrl/pSst +IAySL/WjdpDOU8M7K6/0pydxzn/+axS/UxAV7P6Zm0wdkvvrifT16BdLPBMRLYZEzgW PVSaHxHv+y3s4c4iSX2Z8gMSFfkm5xHtny2NvD/oqLeje0YRQkSN4B6+Up8+mKjfLkad rTBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=gZJPW/lvXGtYKm7JzNSmEVgcUOEegBQAD673Jp3vZ2I=; fh=TEln4GInrhiXG7jDr+whY2yv3pGWSGfSOjeSmHoSLO0=; b=WOHEv3tMTdHFS6w90U50+GXgVyE4DcVvvptXI1zdeJ1xMmTUdZxZKaf+DqwV4VZBiv l9bOetoJXHLFj2FA0wnr6LetegPe0Smg3h9/QD2jVyt7it9dkP2FQV3gcH7vKuMccOkC 8syH5x5I3tWdTQeM08PWqY7hzW32hCALvNgiSySpIZ2cNvFaUBf8R9kDavMTSD6KRTQm dW3IZHIlil9xZHQ8kf34HlARMAoiolr2sfyjCA5G45ZT1cVcRZBOKeVug216nnmMi0F4 OCkjrPfXZCmZjKL2QgPMQQ94vu+Q4RZtA+ZNaFUy84yTQevJM+qOZFnbFQuaOHKfpAwl D1XA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dNNfDLX/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a198fb103csi181968985a.217.2024.07.19.08.13.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jul 2024 08:13:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dNNfDLX/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUpIN-0001e9-Bp; Fri, 19 Jul 2024 11:13:19 -0400 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 1sUpIM-0001dA-6u for qemu-devel@nongnu.org; Fri, 19 Jul 2024 11:13:18 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sUpIJ-0005QQ-SD for qemu-devel@nongnu.org; Fri, 19 Jul 2024 11:13:17 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-427d8f1f363so3976475e9.2 for ; Fri, 19 Jul 2024 08:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721401994; x=1722006794; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gZJPW/lvXGtYKm7JzNSmEVgcUOEegBQAD673Jp3vZ2I=; b=dNNfDLX/3wQaOwjhKBiFMWN1HOHAqHQ/sE/u9zowhZkUT5yo4asdy4LiKEF97QkTo4 RGhNCU/d/Eh2cYt1peEVTQWWZoso9VGdcE9xHf4pgJQwl8AU853iqFhoydk9sqcclKDE nvO7W7kBx8W3Rv4MYuImH2LI5/JZ/k4RYV2ZHE7o+9/+9MpS3tZavQcLivj5e/sQIQ40 SYblEwMXzUt3RF+bjleH5HijG0lR4nSzY1d21woPp1ggJEvWzeodnuZ6gh51+6eaBKP2 RnCXD09NvpRKoFEIuRfejK1j3O307RulIrtyWs3iGhPndjUQDPyTDMfjzWCvo+8TlTtO 9PbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721401994; x=1722006794; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gZJPW/lvXGtYKm7JzNSmEVgcUOEegBQAD673Jp3vZ2I=; b=p9MJiLZwH8Hn9XdVmPRM/WGmzoD+HBu9aFflxrEMRjX9Get5TI2gHhfsxbHk0/Lwq9 dAIdLBykBlVbnVqkODagNkdCtwYEyjC//VwP110zE5cwpFX/Z2rA08QGrFBzURabhaWc glNrARenr1wljyTelcuDaDaOs5E7hg8V0fWiwDQodS0yXs4xpdLYT6IYxfyZHt1mu/ea h4dsp8bZ7nk/CjIsbvCDp8QzW38isfJVpuiSBd0ZQsmBgm0MwjRaFGBE2Tcr2zVqnJqz ofk03ou5t4r1Pum40jULGHtBxEiaaEqoXbIjcAs+QrxNea3EZ46LWeZZ3pbga3etV+9S d3Nw== X-Gm-Message-State: AOJu0Yw2Y2t5BH7TCJpKMr9mR3VMUgsrR4zYCxjNoRP7yrA4e6abYRtA KktMYT75R63fgYjwDMoKRgpgoPjrHrfdxZYYuKZbUuvPJgyvPaYIyKNG4JuXJSHxwMmhZJKJwgw k X-Received: by 2002:adf:eb46:0:b0:35f:2030:d42c with SMTP id ffacd0b85a97d-36831608a1cmr5276461f8f.17.1721401993942; Fri, 19 Jul 2024 08:13:13 -0700 (PDT) Received: from localhost.localdomain ([176.187.209.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3687868b26dsm1830017f8f.34.2024.07.19.08.13.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Jul 2024 08:13:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , qemu-arm@nongnu.org, Peter Maydell , Beraldo Leal , Thomas Huth Subject: [PATCH] tests/avocado: Move common Avocado tags to class Date: Fri, 19 Jul 2024 17:13:10 +0200 Message-ID: <20240719151310.45927-1-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org When Avocado tags apply to all tests in a class, we can define them once in the class: they will be applied to all test methods. Signed-off-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux.py | 2 +- tests/avocado/boot_xen.py | 17 +---------------- tests/avocado/machine_aarch64_virt.py | 10 ++++------ 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index cdce4cbcba..df6cf209ef 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -64,12 +64,12 @@ def test_pc_q35_kvm(self): class BootLinuxAarch64(LinuxTest): """ :avocado: tags=arch:aarch64 - :avocado: tags=machine:virt """ timeout = 720 def test_virt_kvm(self): """ + :avocado: tags=machine:virt :avocado: tags=accel:kvm :avocado: tags=cpu:host """ diff --git a/tests/avocado/boot_xen.py b/tests/avocado/boot_xen.py index fc2faeedb5..93bfb0c161 100644 --- a/tests/avocado/boot_xen.py +++ b/tests/avocado/boot_xen.py @@ -61,8 +61,6 @@ def launch_xen(self, xen_path): class BootXen(BootXenBase): - - def test_arm64_xen_411_and_dom0(self): """ :avocado: tags=arch:aarch64 :avocado: tags=accel:tcg @@ -70,6 +68,7 @@ def test_arm64_xen_411_and_dom0(self): :avocado: tags=machine:virt """ + def test_arm64_xen_411_and_dom0(self): # archive of file from https://deb.debian.org/debian/pool/main/x/xen/ xen_url = ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/' 'download?path=%2F&files=' @@ -81,13 +80,6 @@ def test_arm64_xen_411_and_dom0(self): self.launch_xen(xen_path) def test_arm64_xen_414_and_dom0(self): - """ - :avocado: tags=arch:aarch64 - :avocado: tags=accel:tcg - :avocado: tags=cpu:cortex-a57 - :avocado: tags=machine:virt - """ - # archive of file from https://deb.debian.org/debian/pool/main/x/xen/ xen_url = ('https://fileserver.linaro.org/s/JSsewXGZ6mqxPr5/' 'download?path=%2F&files=' @@ -99,13 +91,6 @@ def test_arm64_xen_414_and_dom0(self): self.launch_xen(xen_path) def test_arm64_xen_415_and_dom0(self): - """ - :avocado: tags=arch:aarch64 - :avocado: tags=accel:tcg - :avocado: tags=cpu:cortex-a57 - :avocado: tags=machine:virt - """ - xen_url = ('https://fileserver.linaro.org/' 's/JSsewXGZ6mqxPr5/download' '?path=%2F&files=xen-upstream-4.15-unstable.deb') diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py index a90dc6ff4b..0ef6df4b0d 100644 --- a/tests/avocado/machine_aarch64_virt.py +++ b/tests/avocado/machine_aarch64_virt.py @@ -20,6 +20,10 @@ from avocado.utils.path import find_command class Aarch64VirtMachine(QemuSystemTest): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:virt + """ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' timeout = 360 @@ -33,8 +37,6 @@ def wait_for_console_pattern(self, success_message, vm=None): # Other test profiles should use more minimal boots def test_alpine_virt_tcg_gic_max(self): """ - :avocado: tags=arch:aarch64 - :avocado: tags=machine:virt :avocado: tags=accel:tcg """ iso_url = ('https://dl-cdn.alpinelinux.org/' @@ -129,8 +131,6 @@ def common_aarch64_virt(self, machine): def test_aarch64_virt_gicv3(self): """ - :avocado: tags=arch:aarch64 - :avocado: tags=machine:virt :avocado: tags=accel:tcg :avocado: tags=cpu:max """ @@ -138,8 +138,6 @@ def test_aarch64_virt_gicv3(self): def test_aarch64_virt_gicv2(self): """ - :avocado: tags=arch:aarch64 - :avocado: tags=machine:virt :avocado: tags=accel:tcg :avocado: tags=cpu:max """