From nobody Sun Nov 24 10:53:48 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=1725446562; cv=none; d=zohomail.com; s=zohoarc; b=cfEk0UBOghmPR36uCtEsr67GyBdDhIGLFf9ZjW0NJ9TG0w6l21dw7upBeEG7CU70iFW2+rcRMFk1uddgQJJdL/UI13dRfPd7owqAAOkeRhyRpZ7KEttsjCnojIs/VpACQfX7BxmnJMQnQDMQqKdmv4doVAIGzjLWGSob5gqMxtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725446562; 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=ajoH62t7koMoEkPS3bEFtLyL7UGuEvc08cjgjR2BBLc=; b=HMRRqj1RcBfxMgGAknzrn1GOfK9TpqA/jmhJPVSL62eUJK4eSEdv6OFLHTcHJkiQoVQ5YvK8AqiE3sEMS/s18SIRFMEbq9+Sk/M9opNBg8Xybxekx+lZ7kLpTHUPJTdOsNPIjMbZf+4VihPJJmOXJBiR8xTcRh1OPVdKcbQTu3Y= 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 1725446562435742.0518188256569; Wed, 4 Sep 2024 03:42:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slnRb-0005oc-PJ; Wed, 04 Sep 2024 06:40:59 -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 1slnRa-0005jJ-HX for qemu-devel@nongnu.org; Wed, 04 Sep 2024 06:40:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1slnRY-0000Qh-KX for qemu-devel@nongnu.org; Wed, 04 Sep 2024 06:40:58 -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-270-BLInFrlaM8GzYTYQ4scEFg-1; Wed, 04 Sep 2024 06:40:54 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 AE9791956083; Wed, 4 Sep 2024 10:40:53 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.48]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 71F821955F44; Wed, 4 Sep 2024 10:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725446456; 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=ajoH62t7koMoEkPS3bEFtLyL7UGuEvc08cjgjR2BBLc=; b=TL3r2Cpq2dD4D8XVBdyDPHQLHtietr9u0CKyK/qaEDt25yBuIqH1mD0/flPkPD9anWrXRq HcxW+a3CgAUk3yt39YF+JYMG9IrVnw12K9/tdHtB78SkCqPMzwTXuM4zBdH4sWiA+QrE+v qNUed6u0L5K/bUekkJy19l/0X7n7c2I= X-MC-Unique: BLInFrlaM8GzYTYQ4scEFg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 31/42] tests/functional: Convert ARM Integrator/CP avocado tests Date: Wed, 4 Sep 2024 12:39:06 +0200 Message-ID: <20240904103923.451847-32-thuth@redhat.com> In-Reply-To: <20240904103923.451847-1-thuth@redhat.com> References: <20240904103923.451847-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.40 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1725446562948116600 From: Philippe Mathieu-Daud=C3=A9 Straight forward conversion. Update the SHA1 hashes to SHA256 hashes since SHA1 should not be used anymore nowadays. $ QEMU_TEST_ALLOW_UNTRUSTED_CODE=3D1 make check-functional-arm ... 6/6 qemu:func-thorough+func-arm-thorough+thorough / func-arm-arm_integrat= orcp OK 3.90s 2 subtests passed Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240822110238.82312-1-philmd@linaro.org> Reviewed-by: Thomas Huth Message-ID: <20240830133841.142644-34-thuth@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- tests/functional/meson.build | 1 + .../test_arm_integratorcp.py} | 56 ++++++++++--------- 3 files changed, 33 insertions(+), 26 deletions(-) rename tests/{avocado/machine_arm_integratorcp.py =3D> functional/test_arm= _integratorcp.py} (63%) mode change 100644 =3D> 100755 diff --git a/MAINTAINERS b/MAINTAINERS index 092d3ec60f..a0b7e68c62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -784,7 +784,7 @@ S: Maintained F: hw/arm/integratorcp.c F: hw/misc/arm_integrator_debug.c F: include/hw/misc/arm_integrator_debug.h -F: tests/avocado/machine_arm_integratorcp.py +F: tests/functional/test_arm_integratorcp.py F: docs/system/arm/integratorcp.rst =20 MCIMX6UL EVK / i.MX6ul diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 2e34f4ddfd..7abd998e3c 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -34,6 +34,7 @@ tests_generic_bsduser =3D [ =20 tests_arm_system_thorough =3D [ 'arm_canona1100', + 'arm_integratorcp', ] =20 tests_avr_system_thorough =3D [ diff --git a/tests/avocado/machine_arm_integratorcp.py b/tests/functional/t= est_arm_integratorcp.py old mode 100644 new mode 100755 similarity index 63% rename from tests/avocado/machine_arm_integratorcp.py rename to tests/functional/test_arm_integratorcp.py index 87f5cf3953..0fe083f661 --- a/tests/avocado/machine_arm_integratorcp.py +++ b/tests/functional/test_arm_integratorcp.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Functional test that boots a Linux kernel and checks the console # # Copyright (c) 2020 Red Hat, Inc. @@ -7,13 +9,15 @@ # # 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 =20 import os import logging =20 -from avocado import skipUnless -from avocado_qemu import QemuSystemTest -from avocado_qemu import wait_for_console_pattern +from qemu_test import QemuSystemTest, Asset +from qemu_test import wait_for_console_pattern +from unittest import skipUnless =20 =20 NUMPY_AVAILABLE =3D True @@ -33,50 +37,49 @@ class IntegratorMachine(QemuSystemTest): =20 timeout =3D 90 =20 - def boot_integratorcp(self): - kernel_url =3D ('https://github.com/zayac/qemu-arm/raw/master/' - 'arm-test/kernel/zImage.integrator') - kernel_hash =3D '0d7adba893c503267c946a3cbdc63b4b54f25468' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) + ASSET_KERNEL =3D Asset( + ('https://github.com/zayac/qemu-arm/raw/master/' + 'arm-test/kernel/zImage.integrator'), + '26e7c7e8f943de785d95bd3c74d66451604a9b6a7a3d25dceb279e7548fd8e78') + + ASSET_INITRD =3D Asset( + ('https://github.com/zayac/qemu-arm/raw/master/' + 'arm-test/kernel/arm_root.img'), + 'e187c27fb342ad148c7f33475fbed124933e0b3f4be8c74bc4f3426a4793373a') =20 - initrd_url =3D ('https://github.com/zayac/qemu-arm/raw/master/' - 'arm-test/kernel/arm_root.img') - initrd_hash =3D 'b51e4154285bf784e017a37586428332d8c7bd8b' - initrd_path =3D self.fetch_asset(initrd_url, asset_hash=3Dinitrd_h= ash) + ASSET_TUXLOGO =3D Asset( + ('https://github.com/torvalds/linux/raw/v2.6.12/' + 'drivers/video/logo/logo_linux_vga16.ppm'), + 'b762f0d91ec018887ad1b334543c2fdf9be9fdfc87672b409211efaa3ea0ef79') =20 + def boot_integratorcp(self): + kernel_path =3D self.ASSET_KERNEL.fetch() + initrd_path =3D self.ASSET_INITRD.fetch() + + self.set_machine('integratorcp') self.vm.set_console() self.vm.add_args('-kernel', kernel_path, '-initrd', initrd_path, '-append', 'printk.time=3D0 console=3DttyAMA0') self.vm.launch() =20 - @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code= ') + @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') def test_integratorcp_console(self): """ Boots the Linux kernel and checks that the console is operational - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:integratorcp - :avocado: tags=3Ddevice:pl011 """ self.boot_integratorcp() wait_for_console_pattern(self, 'Log in as root') =20 @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed') @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed') - @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code= ') + @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') def test_framebuffer_tux_logo(self): """ Boot Linux and verify the Tux logo is displayed on the framebuffer. - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:integratorcp - :avocado: tags=3Ddevice:pl110 - :avocado: tags=3Ddevice:framebuffer """ screendump_path =3D os.path.join(self.workdir, "screendump.pbm") - tuxlogo_url =3D ('https://github.com/torvalds/linux/raw/v2.6.12/' - 'drivers/video/logo/logo_linux_vga16.ppm') - tuxlogo_hash =3D '3991c2ddbd1ddaecda7601f8aafbcf5b02dc86af' - tuxlogo_path =3D self.fetch_asset(tuxlogo_url, asset_hash=3Dtuxlog= o_hash) + tuxlogo_path =3D self.ASSET_TUXLOGO.fetch() =20 self.boot_integratorcp() framebuffer_ready =3D 'Console: switching to colour frame buffer d= evice' @@ -97,3 +100,6 @@ def test_framebuffer_tux_logo(self): for tux_count, pt in enumerate(zip(*loc[::-1]), start=3D1): logger.debug('found Tux at position [x, y] =3D %s', pt) self.assertGreaterEqual(tux_count, cpu_count) + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.46.0