From nobody Wed Oct 23 00:34:06 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=1729527226; cv=none; d=zohomail.com; s=zohoarc; b=IO+3ZWRDrfsUvOi+OgrvsMSiaZchKqRDasDyPNOiyJCsQDi1Pq7ySPYnqNrsscQKM1SacNQwCS8P+t1h7XtLTweX5BOnhN07lu05jQa67lUFHAxU5N3HQcOAkfu8esji4ISoaPGJPbOn5jhcvkLyDJ4SqRqs+zEAZ+PS8DSZp5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729527226; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yYwZiGw0VXAp52pkCAH0yBX6aMBQKwqlcr7JzQV2whk=; b=JEs03CtK9/1OO7RmMox7wtVZOpHY9BxilMKQv5L0ZELb55npXo87otTOHg8dy548qUKKI9F0P5PLOlOu9r3rHBjM7teoRSnX2SozZkTVERvr12ToHVF3/YF81HboVcXPDIjZq8GJJf2So5Lh1OHNpbOnKkh71HejhWcyAnz5bHo= 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 1729527226599599.1904936761622; Mon, 21 Oct 2024 09:13:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2v0x-0003z1-OH; Mon, 21 Oct 2024 12:12:15 -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 1t2v0s-0003yG-Eu for qemu-devel@nongnu.org; Mon, 21 Oct 2024 12:12:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2v0q-0003BY-LI for qemu-devel@nongnu.org; Mon, 21 Oct 2024 12:12:10 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619--lG1nOiENKyPAwy78zMUSg-1; Mon, 21 Oct 2024 12:12:04 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4DB751955EAA; Mon, 21 Oct 2024 16:12:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.49]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0F5531956089; Mon, 21 Oct 2024 16:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729527128; 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=yYwZiGw0VXAp52pkCAH0yBX6aMBQKwqlcr7JzQV2whk=; b=Ow29coXytaXRxsiaGhtCzFd/ibKr54aHp4R20lCrROZDpp1GtGJ/RtMTs5CdaIOpB8qftK nyRJccMzwylYtnvEpaeJim3n3rDiEuWoWWDcYSlYhulf4fu7mebmROk4qn1/kAWRKgjtRS bUhAE/8lf6hy39eJ6Qlp9K1eSg7uCxU= X-MC-Unique: -lG1nOiENKyPAwy78zMUSg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL v2 12/20] tests/functional: Convert the Avocado i386 tuxrun test Date: Mon, 21 Oct 2024 18:11:46 +0200 Message-ID: <20241021161156.176427-3-thuth@redhat.com> In-Reply-To: <20241021161156.176427-1-thuth@redhat.com> References: <20241021161156.176427-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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.129.124; envelope-from=thuth@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=-0.421, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.699, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729527227395116600 Move the tests to a new file so that they can be run via qemu-system-i386 in the functional framework. Signed-off-by: Thomas Huth Message-ID: <20241011131937.377223-10-thuth@redhat.com> --- MAINTAINERS | 1 + tests/avocado/tuxrun_baselines.py | 16 ------------- tests/functional/meson.build | 4 ++++ tests/functional/test_i386_tuxrun.py | 35 ++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 16 deletions(-) create mode 100755 tests/functional/test_i386_tuxrun.py diff --git a/MAINTAINERS b/MAINTAINERS index ffc50bc0be..0c1966e985 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1782,6 +1782,7 @@ F: hw/isa/apm.c F: include/hw/isa/apm.h F: tests/unit/test-x86-topo.c F: tests/qtest/test-x86-cpuid-compat.c +F: tests/functional/test_i386_tuxrun.py F: tests/functional/test_mem_addr_space.py F: tests/functional/test_pc_cpu_hotplug_props.py F: tests/functional/test_x86_cpu_model_versions.py diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_basel= ines.py index 6856a8f46a..f1463336e9 100644 --- a/tests/avocado/tuxrun_baselines.py +++ b/tests/avocado/tuxrun_baselines.py @@ -223,22 +223,6 @@ def test_arm64be(self): "e6ffd8813c8a335bc15728f2835f90539c84be7f8f5f691a8b01451b= 47fb4bd7"} self.common_tuxrun(csums=3Dsums) =20 - def test_i386(self): - """ - :avocado: tags=3Darch:i386 - :avocado: tags=3Dcpu:coreduo - :avocado: tags=3Dmachine:q35 - :avocado: tags=3Dtuxboot:i386 - :avocado: tags=3Dimage:bzImage - :avocado: tags=3Dshutdown:nowait - """ - sums =3D {"bzImage" : - "a3e5b32a354729e65910f5a1ffcda7c14a6c12a55e8213fb86e277f1b= 76ed956", - "rootfs.ext4.zst" : - "f15e66b2bf673a210ec2a4b2e744a80530b36289e04f5388aab812b97= f69754a" } - - self.common_tuxrun(csums=3Dsums, drive=3D"virtio-blk-pci") - def test_mips32(self): """ :avocado: tags=3Darch:mips diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 96a83f54f7..ad112faf36 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -66,6 +66,10 @@ tests_avr_system_thorough =3D [ 'avr_mega2560', ] =20 +tests_i386_system_thorough =3D [ + 'i386_tuxrun', +] + tests_loongarch64_system_thorough =3D [ 'loongarch64_virt', ] diff --git a/tests/functional/test_i386_tuxrun.py b/tests/functional/test_i= 386_tuxrun.py new file mode 100755 index 0000000000..c593ffbe8c --- /dev/null +++ b/tests/functional/test_i386_tuxrun.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +# +# Functional test that boots known good tuxboot images the same way +# that tuxrun (www.tuxrun.org) does. This tool is used by things like +# the LKFT project to run regression tests on kernels. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Author: +# Alex Benn=C3=A9e +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from qemu_test.tuxruntest import TuxRunBaselineTest + +class TuxRunI386Test(TuxRunBaselineTest): + + ASSET_I386_KERNEL =3D Asset( + 'https://storage.tuxboot.com/20230331/i386/bzImage', + 'a3e5b32a354729e65910f5a1ffcda7c14a6c12a55e8213fb86e277f1b76ed956') + ASSET_I386_ROOTFS =3D Asset( + 'https://storage.tuxboot.com/20230331/i386/rootfs.ext4.zst', + 'f15e66b2bf673a210ec2a4b2e744a80530b36289e04f5388aab812b97f69754a') + + def test_i386(self): + self.set_machine('q35') + self.cpu=3D"coreduo" + self.wait_for_shutdown=3DFalse + self.common_tuxrun(kernel_asset=3Dself.ASSET_I386_KERNEL, + rootfs_asset=3Dself.ASSET_I386_ROOTFS, + drive=3D"virtio-blk-pci") + +if __name__ =3D=3D '__main__': + TuxRunBaselineTest.main() --=20 2.47.0