From nobody Wed Oct 23 00:28: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=1729527314; cv=none; d=zohomail.com; s=zohoarc; b=UCHZ2Mumxzv14agO6RNAdLbRnis55Zhc0qvHV/zab158AeGIBcnFzzFloDZ2aPFIzfYv/t5c4lAgTt0Hu20lTyMkcEhv7Ei9PC9od9Vg1msuYPGupuaGkl/GcgkmCeXnilATnFBj9aji4oWh9/+guXtBUEChCXlwl5Cn0OeU+F0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729527314; 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=64bqzH07nxjia66UnV1/AmUghsFPcT6V9c+kK4hzO7A=; b=i7Uy1Fg4bI/qTcGP4ly5Np7O8GUMOOj+JFIBV6Jw3GfRT6NBRaUCjGtA+YbDSVsyrgNn+xeQkKjlWso0MM+wZGzTvlJfWXF1HsOTkazzW2cBrZw4Gh8Y9+uLrH30b0JyIJBheVAaJZqi1J4OqLrNMDY5R9ZN/IAw59i4S2Mj/60= 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 1729527314216552.3100465855373; Mon, 21 Oct 2024 09:15:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2v14-000419-CD; Mon, 21 Oct 2024 12:12:25 -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 1t2v13-00040e-4p for qemu-devel@nongnu.org; Mon, 21 Oct 2024 12:12:21 -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 1t2v11-0003CX-3f for qemu-devel@nongnu.org; Mon, 21 Oct 2024 12:12:20 -0400 Received: from mx-prod-mc-03.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-503-DTGF2W-LMbeBvlPSaOUwkA-1; Mon, 21 Oct 2024 12:12:15 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8CE061955BE1; Mon, 21 Oct 2024 16:12:14 +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 09D001956088; Mon, 21 Oct 2024 16:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729527137; 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=64bqzH07nxjia66UnV1/AmUghsFPcT6V9c+kK4hzO7A=; b=SXXvC41xSgFOAz0X0JNgN4M4b1VYc3nYnIwPDoF/c0UouNb+4mnKHIwelj/BlHb0p4RVx9 WbpgHeu7uNvymIPewWo5U6oAQhlOtlshRtEo/owaXw8Rfx87oh9LCJG3FkxFlPm1ZvuyeC gtMDuDXpTxq439/tsjS7n4DFFaYqM1s= X-MC-Unique: DTGF2W-LMbeBvlPSaOUwkA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL v2 17/20] tests/functional: Convert the Avocado mips64el tuxrun test Date: Mon, 21 Oct 2024 18:11:51 +0200 Message-ID: <20241021161156.176427-8-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: 1729527315866116600 Move the test into a new file so that it can be run via qemu-system-mips64el in the functional framework. Signed-off-by: Thomas Huth Message-ID: <20241011131937.377223-15-thuth@redhat.com> --- MAINTAINERS | 5 ++-- tests/avocado/tuxrun_baselines.py | 16 ----------- tests/functional/meson.build | 1 + tests/functional/test_mips64el_tuxrun.py | 35 ++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 19 deletions(-) create mode 100755 tests/functional/test_mips64el_tuxrun.py diff --git a/MAINTAINERS b/MAINTAINERS index c7cd5a28d9..cd9ebe77c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1312,9 +1312,8 @@ F: hw/mips/malta.c F: hw/pci-host/gt64120.c F: include/hw/southbridge/piix.h F: tests/avocado/linux_ssh_mips_malta.py -F: tests/functional/test_mips_malta.py -F: tests/functional/test_mipsel_malta.py -F: tests/functional/test_mips64el_malta.py +F: tests/functional/test_mips*_malta.py +F: tests/functional/test_mips*_tuxrun.py =20 Mipssim R: Aleksandar Rikalo diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_basel= ines.py index f7de13735c..76afbfd8f0 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_mips64el(self): - """ - :avocado: tags=3Darch:mips64el - :avocado: tags=3Dmachine:malta - :avocado: tags=3Dtuxboot:mips64el - :avocado: tags=3Dimage:vmlinux - :avocado: tags=3Droot:sda - :avocado: tags=3Dshutdown:nowait - """ - sums =3D { "rootfs.ext4.zst" : - "fba585368f5915b1498ed081863474b2d7ec4e97cdd46d21bdcb2f96= 98f83de4", - "vmlinux" : - "d4e08965e2155c4cccce7c5f34d18fe34c636cda2f2c9844387d6149= 50155266" } - - self.common_tuxrun(csums=3Dsums, drive=3D"driver=3Dide-hd,bus=3Did= e.0,unit=3D0") - def test_ppc32(self): """ :avocado: tags=3Darch:ppc diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 0f2eca6495..98e9229c4d 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -106,6 +106,7 @@ tests_mips64el_system_thorough =3D [ 'mips64el_fuloong2e', 'mips64el_loongson3v', 'mips64el_malta', + 'mips64el_tuxrun', ] =20 tests_or1k_system_thorough =3D [ diff --git a/tests/functional/test_mips64el_tuxrun.py b/tests/functional/te= st_mips64el_tuxrun.py new file mode 100755 index 0000000000..819549a27b --- /dev/null +++ b/tests/functional/test_mips64el_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 TuxRunMips64ELTest(TuxRunBaselineTest): + + ASSET_MIPS64EL_KERNEL =3D Asset( + 'https://storage.tuxboot.com/20230331/mips64el/vmlinux', + 'd4e08965e2155c4cccce7c5f34d18fe34c636cda2f2c9844387d614950155266') + ASSET_MIPS64EL_ROOTFS =3D Asset( + 'https://storage.tuxboot.com/20230331/mips64el/rootfs.ext4.zst', + 'fba585368f5915b1498ed081863474b2d7ec4e97cdd46d21bdcb2f9698f83de4') + + def test_mips64el(self): + self.set_machine('malta') + self.root=3D"sda" + self.wait_for_shutdown=3DFalse + self.common_tuxrun(kernel_asset=3Dself.ASSET_MIPS64EL_KERNEL, + rootfs_asset=3Dself.ASSET_MIPS64EL_ROOTFS, + drive=3D"driver=3Dide-hd,bus=3Dide.0,unit=3D0") + +if __name__ =3D=3D '__main__': + TuxRunBaselineTest.main() --=20 2.47.0