From patchwork Wed Aug 21 12:57:01 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: 820981 Delivered-To: patch@linaro.org Received: by 2002:adf:e98a:0:b0:367:895a:4699 with SMTP id h10csp687277wrm; Wed, 21 Aug 2024 05:57:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQ6DSgLnVyO7CjBiWzMhp1uMAwsRpl1XjPBcU5o8GupgQKEHlHHOsIc8/622k0pfC+nc4VWg==@linaro.org X-Google-Smtp-Source: AGHT+IFefPm29N7HTfDQy60LbgKN11fntxB80xxWyY51nnXzfqnvPIK+saD8p7QIlq5Hp3qXvsCy X-Received: by 2002:a05:620a:3705:b0:79f:879:63ad with SMTP id af79cd13be357-7a6740c21c6mr264411285a.46.1724245059287; Wed, 21 Aug 2024 05:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724245059; cv=none; d=google.com; s=arc-20160816; b=iQSk12LJNjoYXd7Oj8klf8jqBjIGEKovvIO0WN2GR7gr0NHpVBAEGXvqhdUAwJQzfH egLLbm3Ci1N9eZfAsVzBohUQbWLbbsOCdO4/XyqW6Y5YL/tsx3Tim4je6T0vdQQ2qVOb yc5G39uLx9re6r+4oNM7nkOLo61LHn/3PXFXOSI4tMQJVh30z9xHzl2GZ0sxJ6SeFAlb sOSJtiGgVwkH2DAS1/f+GLSI0zAFxD3vSzkJ6ciCp4gLyTqAyXHWYWUOUygZ5ryoPXqn CAZV3aNmS99ubNlhvJMmkBmAHJ9NWSIr6kyfdRoMnI9qxiQt9rpD918majUaErXXZxWh //YA== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gd/SCxyYkI0efJQ+vnAG1pfl86SvWJjE5pQY9rON6c4=; fh=aofcXGS7Yi6Rb4QyAea2pzblrMjPgrHfOsH7Z8mChF0=; b=eJ2tKETkgy3SnscbUmCh5C/9y0ckjZi3hut9UgQaDRWdkSX7cs7bd/rk6BsxN22fR2 b8758HC/Agnhq/Btc6+wJy/KfiK0Pwy0IDbft2d6EO4Gel0R5mioDrx6P6q3sllsXNQv YvhXMLiPT/oICDyBF2yxappN6QnR3L0XqLsMCMnjbA0aTj9umfLy4UU8S5Tald8g8mlW h2eHjse50tW1BaLZzJalpNk+LTJBXGW2eK15QXBJT4//E+yK7AW07/Ys7hmvh7Hna1/0 fmQajbBQQ1fZiBAjHfeI7B4pM3Vj0opytTr5PElfrTe9Zpdz2SaQT4GGgMLLSrR7kRTK mbzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YZODph6C; 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-7a66e9dcdf6si305085385a.418.2024.08.21.05.57.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Aug 2024 05:57:39 -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=YZODph6C; 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 1sgku7-0008Ru-9b; Wed, 21 Aug 2024 08:57:35 -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 1sgku2-000889-N3 for qemu-devel@nongnu.org; Wed, 21 Aug 2024 08:57:30 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgku0-0005A6-JE for qemu-devel@nongnu.org; Wed, 21 Aug 2024 08:57:30 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42816ca797fso54999145e9.2 for ; Wed, 21 Aug 2024 05:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724245045; x=1724849845; 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=Gd/SCxyYkI0efJQ+vnAG1pfl86SvWJjE5pQY9rON6c4=; b=YZODph6CMD6QXeCpE6+qoRSB9dd/MyNpeeV1DIKBm/iziofSOIjp7NnRZden46c3UB zuZ3mY+D6lkYHKSwKIQ/b7vUT0sTihExoMW7pM/vf88LBv42shauQ2AMe4rGL2gHOD3c QVXUMKc34Qi6yu3Zrvxv+o6E3NGpTyJLtL4SdOikAHnilOK6yKecgJCxMhNf1r/4BMvj bJFZhq+2KegUFnhgP0hVl+vpMtLkC3WJ37dDyonC99X+KzXGElWhgn5khBBxQe7JRnGr 8W4Mr3GY+UQG+/3fIca5rCC1EUXP4vlANiUmcPB89+IaddUi/du85dfQ5iN0NZE+IK4g YPhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724245045; x=1724849845; 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=Gd/SCxyYkI0efJQ+vnAG1pfl86SvWJjE5pQY9rON6c4=; b=p2gVU2iBndvoeD56W2uq4Unx3wBbe1RSKZ5R32OxEkRJDyv7WhJ3cNiddka34h0iz0 3r5VcmKUFEG8LNiL0241kKoP7XV7LfHYw6amaO/+dxe3sLPZAJGVyp7PlEWBzc7cMrXU fWxvC7gHpe3wK/YQ7vYh+GMI4gZDHEdGUak22ACTFMKJ5duF++KIBSRV81ddaNgxEy0a BiZ8s4wMFiTQiX1h/zwitxh8fsPEZE6BqCdEGUCsyBeRWC4KlNyAK1jdawWPMF6x0Efr 6NvS7IkCq/IHpTQE1VSW52gtn5IHMYYky1fzp19a4lP06kci4ozbJQ5D7I8GD1oZGKma 4E9Q== X-Gm-Message-State: AOJu0YyKWr3FjUYhYNbnWRQ/CmIGSjkuli5McR/VQFZlzEdsJEjQ1+JG Xum4/n9hurgIjsvdS5zl8d9d6NDOPRi8NUIonWk8zR4WUjywIUmU+ZrKiftiHUnL9fuElTqIexj dvWE= X-Received: by 2002:a05:600c:4451:b0:426:6c70:dd9c with SMTP id 5b1f17b1804b1-42abd25466fmr16936955e9.31.1724245045084; Wed, 21 Aug 2024 05:57:25 -0700 (PDT) Received: from m1x-phil.lan ([176.187.218.99]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42abed91134sm25490105e9.4.2024.08.21.05.57.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Aug 2024 05:57:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Jiaxun Yang , Aurelien Jarno , Beraldo Leal , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH 2/2] tests/functional: Convert mipsel Malta YAMON avocado test Date: Wed, 21 Aug 2024 14:57:01 +0200 Message-ID: <20240821125701.63042-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240821125701.63042-1-philmd@linaro.org> References: <20240821125701.63042-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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 | 46 +++++++++++++++++++++ 5 files changed, 54 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 Mipssim diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mips_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é -# -# 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 = ('https://s3-eu-west-1.amazonaws.com/' - 'downloads-mips/mips-downloads/' - 'YAMON/yamon-bin-02.22.zip') - rom_hash = '8da7ecddbc5312704b8b324341ee238189bde480' - zip_path = self.fetch_asset(rom_url, asset_hash=rom_hash) - - archive.extract(zip_path, self.workdir) - yamon_path = os.path.join(self.workdir, 'yamon-02.22.bin') - - self.vm.set_console() - self.vm.add_args('-bios', yamon_path) - self.vm.launch() - - prompt = 'YAMON>' - pattern = '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=arch:mipsel - :avocado: tags=machine:malta - :avocado: tags=endian:little - """ - self.do_test_yamon() - - def test_mips64el_malta_yamon(self): - """ - :avocado: tags=arch:mips64el - :avocado: tags=machine:malta - :avocado: tags=endian:little - """ - self.do_test_yamon() diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 1823f88897..67f6e7257e 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -51,6 +51,10 @@ tests_microblazeel_thorough = [ 'microblazeel_s3adsp1800' ] +tests_mipsel_thorough = [ + 'mipsel_malta', +] + tests_mips64el_quick = [ 'mips64el_fuloong2e', ] diff --git a/tests/functional/test_mips64el_malta.py b/tests/functional/test_mips64el_malta.py index 05d2c5f85b..fd5aeb982e 100755 --- a/tests/functional/test_mips64el_malta.py +++ b/tests/functional/test_mips64el_malta.py @@ -107,5 +107,8 @@ def test_mips_malta_i6400_framebuffer_logo_8cores(self): self.do_test_i6400_framebuffer_logo(8) +from test_mipsel_malta import MaltaMachineYAMON + + if __name__ == '__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..5d2a7a5493 --- /dev/null +++ b/tests/functional/test_mipsel_malta.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 +# +# Functional tests for the little-endian 32-bit MIPS Malta board +# +# Copyright (c) Philippe Mathieu-Daudé +# +# 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 = 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): + zip_path = self.ASSET_YAMON_ROM.fetch() + with ZipFile(zip_path, 'r') as zf: + zf.extractall(path=self.workdir) + yamon_path = os.path.join(self.workdir, 'yamon-02.22.bin') + + self.set_machine('malta') + self.vm.set_console() + self.vm.add_args('-bios', yamon_path) + self.vm.launch() + + prompt = 'YAMON>' + pattern = 'YAMON ROM Monitor' + interrupt_interactive_console_until_pattern(self, pattern, prompt) + wait_for_console_pattern(self, prompt) + self.vm.shutdown() + + +if __name__ == '__main__': + QemuSystemTest.main()