From nobody Sun Nov 24 13:25:31 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1724515770; cv=none; d=zohomail.com; s=zohoarc; b=lFJL68dnSA/+cOzYKc2BxmR7aXKxf2803XQn9DYU9v93uA2Vd12EwZWnVoxvGg5dhBzKoksY6XnIWRESxS2KV/obqhJ1pG94QfJYqjHfRJL3klVTw5FIuhuGXeeW1+X8bqtbN7+Po4xjnSt/7nZ9JToiwOvkcvFPASbdIHw/7h0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724515770; 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=3QdbxbI854ZTO/gtBO6n5zu6aFjD9CP3NqK/prfYPq0=; b=V5f5Ws2u/3CS01IhPBIu8oxnEKrs/WvtVeOUn0e3kox84NpgcHNEIk6Ze+7tbixDiN35085ebKxUUd+CeP9G83ZTUa7ZNJAMzIdU98AMbC6T5MnNdXii7Ux40KOKqeK0sUSeRk9YT9Ef6CBiVNwvqSFnLBi/8Psl0AnrqNA/yYY= 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 1724515770146376.84987901023385; Sat, 24 Aug 2024 09:09:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shtKH-0006MO-0T; Sat, 24 Aug 2024 12:09:17 -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 1shtKE-0006HS-Bb for qemu-devel@nongnu.org; Sat, 24 Aug 2024 12:09:14 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1shtKC-0005ya-5H for qemu-devel@nongnu.org; Sat, 24 Aug 2024 12:09:14 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a869332c2c2so431895966b.0 for ; Sat, 24 Aug 2024 09:09:11 -0700 (PDT) Received: from m1x-phil.lan ([176.187.198.30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a868f2202fdsm421099766b.13.2024.08.24.09.09.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 24 Aug 2024 09:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724515750; x=1725120550; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3QdbxbI854ZTO/gtBO6n5zu6aFjD9CP3NqK/prfYPq0=; b=MoXggexwkN1feH2ZWoHNzt+WQem0t2TWTNDF8u7tTNLv/Pvd6loqqhnsyfYQTDVVUY 9XeOyhJIOycNsipaSgozYT0FS0NZYF6yGmnHf6EOurSeG85G1PvcNhRY8JKknP4qnpzL 6YaRdL32Tyk7HV/oIji966Q2NaD3w5dGpNVEdgCAVFgLxOkOLo8o6Ve89vLO0AhnwjSH XrrarJkB3beZ1KZ3q6CnvpsTdK8Pu+oFGnjhtp5pOTiE4v82ssnIGaPpDqITueaIAqhE GVbgg1MVj5kLUTm87MRDIKAXvTvH2UIf5jZJOIbEDlI9eeJUfVHSHpJXVsFXDjSw6a7p HKsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724515750; x=1725120550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3QdbxbI854ZTO/gtBO6n5zu6aFjD9CP3NqK/prfYPq0=; b=YwAVqaQtfSlFBpQdzv1rC9JTbeIAgC+1C78ak/KBlQpUWS52xJSOCiri6gbgTRsyen aIBuac4MTdhcMpQlqXSXDjCB1elKGl8r1/WrTYpkw1zI/1zFUQ/N5ShA1ZCkibG1PEuC N6EX7rl395trJPYAv2dqZOlxyODRJUTAcZj8AI8Z/b5vZI0hS298aw9Hgdn62y9ikllm JGG0X9DrgZaWJm8AvmtKb2IXAKVwdhO5L5bJZfIlpxhzusmk+5zR3u9LRX4h5MP0fbUK g5LC+0VYnDmT8fGc9x3bwtIFZ0NQukSNiiqqAa7Uw7tx+AsLKvS/PYO7NzZO0JefSvww 944g== X-Gm-Message-State: AOJu0YzRIs+WjIQvXrNpajfI+PSh6hWNDdG768nTvfExgPifXvbfy23+ 1fT7rExulbYGMBm561DdvcuwHZnn3ciRPd3wHda7ub9FCV/8VThKFmgCv3seCkhfU7AHbDW6O8n W X-Google-Smtp-Source: AGHT+IHmlJFupc9DwEpApNNm4d+C7mbisHOSXL/SoFgH/z8P2nkcLKNC2TGWkFqO0fdlIKI1W8ldjg== X-Received: by 2002:a17:907:2d11:b0:a86:a30f:4b00 with SMTP id a640c23a62f3a-a86a30f4d3fmr625576066b.27.1724515750210; Sat, 24 Aug 2024 09:09:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Cleber Rosa , Thomas Huth , Aurelien Jarno , Huacai Chen , Beraldo Leal , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/7] tests/functional: Convert mips32el Malta YAMON avocado test Date: Sat, 24 Aug 2024 18:08:26 +0200 Message-ID: <20240824160829.27655-6-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240824160829.27655-1-philmd@linaro.org> References: <20240824160829.27655-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::629; envelope-from=philmd@linaro.org; helo=mail-ej1-x629.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, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1724515770903116600 Straight forward conversion using the Python standard zipfile module instead of avocado.utils package. Update the SHA1 hashes to SHA256 hashes since SHA1 should not be used anymore nowadays. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- MAINTAINERS | 2 +- tests/avocado/machine_mips_malta.py | 54 ------------------------- tests/functional/meson.build | 4 ++ tests/functional/test_mips64el_malta.py | 3 ++ tests/functional/test_mipsel_malta.py | 47 +++++++++++++++++++++ 5 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 tests/avocado/machine_mips_malta.py create mode 100755 tests/functional/test_mipsel_malta.py diff --git a/MAINTAINERS b/MAINTAINERS index 3a91017979..4b480135f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1368,7 +1368,7 @@ 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/avocado/machine_mips_malta.py +F: tests/functional/test_mipsel_malta.py F: tests/functional/test_mips64el_malta.py =20 Mipssim diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mi= ps_malta.py deleted file mode 100644 index 05c64e18c4..0000000000 --- a/tests/avocado/machine_mips_malta.py +++ /dev/null @@ -1,54 +0,0 @@ -# Functional tests for the MIPS Malta board -# -# Copyright (c) Philippe Mathieu-Daud=C3=A9 -# -# This work is licensed under the terms of the GNU GPL, version 2 or later. -# See the COPYING file in the top-level directory. -# -# SPDX-License-Identifier: GPL-2.0-or-later - -import os - -from avocado.utils import archive -from avocado_qemu import QemuSystemTest -from avocado_qemu import interrupt_interactive_console_until_pattern -from avocado_qemu import wait_for_console_pattern - - -class MaltaMachine(QemuSystemTest): - - def do_test_yamon(self): - rom_url =3D ('https://s3-eu-west-1.amazonaws.com/' - 'downloads-mips/mips-downloads/' - 'YAMON/yamon-bin-02.22.zip') - rom_hash =3D '8da7ecddbc5312704b8b324341ee238189bde480' - zip_path =3D self.fetch_asset(rom_url, asset_hash=3Drom_hash) - - archive.extract(zip_path, self.workdir) - yamon_path =3D os.path.join(self.workdir, 'yamon-02.22.bin') - - self.vm.set_console() - self.vm.add_args('-bios', yamon_path) - self.vm.launch() - - prompt =3D 'YAMON>' - pattern =3D 'YAMON ROM Monitor' - interrupt_interactive_console_until_pattern(self, pattern, prompt) - wait_for_console_pattern(self, prompt) - self.vm.shutdown() - - def test_mipsel_malta_yamon(self): - """ - :avocado: tags=3Darch:mipsel - :avocado: tags=3Dmachine:malta - :avocado: tags=3Dendian:little - """ - self.do_test_yamon() - - def test_mips64el_malta_yamon(self): - """ - :avocado: tags=3Darch:mips64el - :avocado: tags=3Dmachine:malta - :avocado: tags=3Dendian:little - """ - self.do_test_yamon() diff --git a/tests/functional/meson.build b/tests/functional/meson.build index a82dbd43bb..f8e482a87c 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -51,6 +51,10 @@ tests_microblazeel_thorough =3D [ 'microblazeel_s3adsp1800' ] =20 +tests_mipsel_thorough =3D [ + 'mipsel_malta', +] + tests_mips64el_quick =3D [ 'mips64el_fuloong2e', ] diff --git a/tests/functional/test_mips64el_malta.py b/tests/functional/tes= t_mips64el_malta.py index 1829bed69a..3962cb43f2 100755 --- a/tests/functional/test_mips64el_malta.py +++ b/tests/functional/test_mips64el_malta.py @@ -186,5 +186,8 @@ def test_mips_malta_i6400_framebuffer_logo_8cores(self): self.do_test_i6400_framebuffer_logo(8) =20 =20 +from test_mipsel_malta import MaltaMachineYAMON + + if __name__ =3D=3D '__main__': QemuSystemTest.main() diff --git a/tests/functional/test_mipsel_malta.py b/tests/functional/test_= mipsel_malta.py new file mode 100755 index 0000000000..f31f96b012 --- /dev/null +++ b/tests/functional/test_mipsel_malta.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python3 +# +# Functional tests for the little-endian 32-bit MIPS Malta board +# +# Copyright (c) Philippe Mathieu-Daud=C3=A9 +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os + +from qemu_test import QemuSystemTest, Asset +from qemu_test import interrupt_interactive_console_until_pattern +from qemu_test import wait_for_console_pattern +from zipfile import ZipFile + + +class MaltaMachineYAMON(QemuSystemTest): + + ASSET_YAMON_ROM =3D Asset( + ('https://s3-eu-west-1.amazonaws.com/downloads-mips/mips-downloads= /' + 'YAMON/yamon-bin-02.22.zip'), + 'eef86f0eed0ef554f041dcd47b87eebea0e6f9f1184ed31f7e9e8b4a803860ab') + + def test_mipsel_malta_yamon(self): + yamon_bin =3D 'yamon-02.22.bin' + zip_path =3D self.ASSET_YAMON_ROM.fetch() + with ZipFile(zip_path, 'r') as zf: + zf.extract(yamon_bin, path=3Dself.workdir) + yamon_path =3D os.path.join(self.workdir, yamon_bin) + + self.set_machine('malta') + self.vm.set_console() + self.vm.add_args('-bios', yamon_path) + self.vm.launch() + + prompt =3D 'YAMON>' + pattern =3D 'YAMON ROM Monitor' + interrupt_interactive_console_until_pattern(self, pattern, prompt) + wait_for_console_pattern(self, prompt) + self.vm.shutdown() + + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.45.2