From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:505:3501:b0:1be9:327d:8ee3 with SMTP id mc1csp392608njb; Fri, 11 Oct 2024 06:20:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRYaL+CtrK2LkvaozWLQguRKi5mUyWauhdZmZbkfpWU4Jc4T/l0ObWDTVxVgeUpNg27bO5PanN1WWYuw==@linaro.org X-Google-Smtp-Source: AGHT+IEVvovgsrjd+k82J/I/eTOpfrHWMEdp9RuLF1zlEsOcLLf8IQmOI0qf6LxMqt3kGOHhWIja X-Received: by 2002:a05:620a:248a:b0:7a7:fdef:27a with SMTP id af79cd13be357-7b11a3b99femr399299285a.58.1728652828037; Fri, 11 Oct 2024 06:20:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728652828; cv=none; d=google.com; s=arc-20240605; b=Gx9mBM5OKjyqvAjY5PX2FLwUysQgDNiQIoMAaH8Q8Iaum73L5zzsE4cqIkrRCgk+J8 uwq4dsFyqHcSVyj3WYMY703JZJJ1VodQ3ggPCZRtdnSd8I7xiBE9ikwEFy5IuFnWacEX 1rcJG49U/Wj9pYbcOD+9Sj9+Xy3hQqOZWSg0aqFJdO7UDRvfV97cM7Se7BAvFxvDRXm6 PMnMqSvbGvJsbozSJ7GoNUZB5c508n28M8bM26DQVcV/3UwMYoW1eda47il0+tWMEnlU YceMdkufmu4DQ5BfvDHxazVKd1xEwBXNAPjiGxoS0Ulfe58DJxK+YGHxtDm5SYBxIjl0 v6QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=zPNfpfDvWtmP4PtGb7znLgZ/uVOBTtjckSTAJHVQg7M=; fh=yV7XiH9Iqz9ECmsY7O4iL5H1OqntXAXD46ZP2pth0HE=; b=QWBeVy1Ru62BE1abRteDzElQyNouuKDuQ2a5zI/8nUCdM5qJtPC6hVkyxWEv/3j+f5 Wdsz201mcSvV3YmMRBe31OiLx72Zg3+S0dqk/YJBZf8+30+cSEdHHHDN8qKhlJ0YEauO ViRHOilalVJBnoc2VHiFRsgzem3JpSjOnbNeWaPJQ7Armm9UTJcy9eR5mwGXs2Awb/OD EoBGSrKyrbS2GcEflce8IxkAMp2gR2iGDZcO6TBxFBvI34TR85O7k5tzY81XhKhDBiiu i2r0YesuI4IDLKNCSXqI9hdrX4wxqU3o/QJ0vXGO33JTlOIoywAlrvvvspN/fdpt9mbb GBjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hfil2CR7; spf=pass (google.com: domain of thuth@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=thuth@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id af79cd13be357-7b1148fd2e4si370725385a.86.2024.10.11.06.20.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 06:20:28 -0700 (PDT) Received-SPF: pass (google.com: domain of thuth@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hfil2CR7; spf=pass (google.com: domain of thuth@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=thuth@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728652827; 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=zPNfpfDvWtmP4PtGb7znLgZ/uVOBTtjckSTAJHVQg7M=; b=Hfil2CR7UaogCd9LKr1hgdTXO/AuAmN+kChi12EtJNw5mK5Dv/3s1q3uHPkajEmwsM7LgN PlvduBUU/YplRFz223G0X5JvQAnWQWc+pCAuoT2vpOj328D61hN+HcIKR5BSnLPewYZehN bG3vO8u5DkKFb6MzOtG/Q/lNhHAEutY= 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-448-Lb80wzUvOy6OwZKlXEKBGQ-1; Fri, 11 Oct 2024 09:20:22 -0400 X-MC-Unique: Lb80wzUvOy6OwZKlXEKBGQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 1502E1955E9D; Fri, 11 Oct 2024 13:20:21 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.77]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F308B1955EA2; Fri, 11 Oct 2024 13:20:17 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Cc: Guenter Roeck , Yoshinori Sato , Magnus Damm , qemu-arm@nongnu.org, Thomas Huth Subject: [PATCH 06/17] tests/functional: Convert the Avocado arm tuxrun tests Date: Fri, 11 Oct 2024 15:19:23 +0200 Message-ID: <20241011131937.377223-7-thuth@redhat.com> In-Reply-To: <20241011131937.377223-1-thuth@redhat.com> References: <20241011131937.377223-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-TUID: oUl0RnE4aDsM Move the tests to a new file so that they can be run via qemu-system-arm in the functional framework. Signed-off-by: Thomas Huth --- tests/avocado/tuxrun_baselines.py | 56 ----------------------- tests/functional/meson.build | 2 + tests/functional/test_arm_tuxrun.py | 70 +++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 56 deletions(-) create mode 100755 tests/functional/test_arm_tuxrun.py diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py index 98dce857cf..59ca9f9706 100644 --- a/tests/avocado/tuxrun_baselines.py +++ b/tests/avocado/tuxrun_baselines.py @@ -192,62 +192,6 @@ def common_tuxrun(self, # --kernel https://storage.tuxboot.com/{TUXBOOT}/{IMAGE} # - def test_armv5(self): - """ - :avocado: tags=arch:arm - :avocado: tags=cpu:arm926 - :avocado: tags=machine:versatilepb - :avocado: tags=tuxboot:armv5 - :avocado: tags=image:zImage - :avocado: tags=console:ttyAMA0 - :avocado: tags=shutdown:nowait - """ - sums = { "rootfs.ext4.zst" : - "17177afa74e7294da0642861f08c88ca3c836764299a54bf6d1ce276cb9712a5", - "versatile-pb.dtb" : - "0bc0c0b0858cefd3c32b385c0d66d97142ded29472a496f4f490e42fc7615b25", - "zImage" : - "c95af2f27647c12265d75e9df44c22ff5228c59855f54aaa70f41ec2842e3a4d" } - - self.common_tuxrun(csums=sums, - drive="virtio-blk-pci", - dt="versatile-pb.dtb") - - def test_armv7(self): - """ - :avocado: tags=arch:arm - :avocado: tags=cpu:cortex-a15 - :avocado: tags=machine:virt - :avocado: tags=tuxboot:armv7 - :avocado: tags=image:zImage - :avocado: tags=console:ttyAMA0 - :avocado: tags=shutdown:nowait - """ - sums = { "rootfs.ext4.zst" : - "ab1fbbeaddda1ffdd45c9405a28cd5370c20f23a7cbc809cc90dc9f243a8eb5a", - "zImage" : - "4c7a22e9f15875bec06bd2a29d822496571eb297d4f22694099ffcdb19077572" } - - self.common_tuxrun(csums=sums) - - def test_armv7be(self): - """ - :avocado: tags=arch:arm - :avocado: tags=cpu:cortex-a15 - :avocado: tags=endian:big - :avocado: tags=machine:virt - :avocado: tags=tuxboot:armv7be - :avocado: tags=image:zImage - :avocado: tags=console:ttyAMA0 - :avocado: tags=shutdown:nowait - """ - sums = {"rootfs.ext4.zst" : - "42ed46dd2d59986206c5b1f6cf35eab58fe3fd20c96b41aaa16b32f3f90a9835", - "zImage" : - "7facc62082b57af12015b08f7fdbaf2f123ba07a478367853ae12b219afc9f2f" } - - self.common_tuxrun(csums=sums) - def test_i386(self): """ :avocado: tags=arch:i386 diff --git a/tests/functional/meson.build b/tests/functional/meson.build index d598f43289..ae913781ec 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -17,6 +17,7 @@ test_timeouts = { 'aarch64_virt' : 360, 'acpi_bits' : 240, 'arm_raspi2' : 120, + 'arm_tuxrun' : 120, 'mips_malta' : 120, 'netdev_ethtool' : 180, 'ppc_40p' : 240, @@ -56,6 +57,7 @@ tests_arm_system_thorough = [ 'arm_integratorcp', 'arm_raspi2', 'arm_vexpress', + 'arm_tuxrun', ] tests_arm_linuxuser_thorough = [ diff --git a/tests/functional/test_arm_tuxrun.py b/tests/functional/test_arm_tuxrun.py new file mode 100755 index 0000000000..944f0756e1 --- /dev/null +++ b/tests/functional/test_arm_tuxrun.py @@ -0,0 +1,70 @@ +#!/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ée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from qemu_test.tuxruntest import TuxRunBaselineTest + +class TuxRunArmTest(TuxRunBaselineTest): + + ASSET_ARMV5_KERNEL = Asset( + 'https://storage.tuxboot.com/20230331/armv5/zImage', + 'c95af2f27647c12265d75e9df44c22ff5228c59855f54aaa70f41ec2842e3a4d') + ASSET_ARMV5_ROOTFS = Asset( + 'https://storage.tuxboot.com/20230331/armv5/rootfs.ext4.zst', + '17177afa74e7294da0642861f08c88ca3c836764299a54bf6d1ce276cb9712a5') + ASSET_ARMV5_DTB = Asset( + 'https://storage.tuxboot.com/20230331/armv5/versatile-pb.dtb', + '0bc0c0b0858cefd3c32b385c0d66d97142ded29472a496f4f490e42fc7615b25') + + def test_armv5(self): + self.set_machine('versatilepb') + self.cpu='arm926' + self.console='ttyAMA0' + self.wait_for_shutdown=False + self.common_tuxrun(kernel_asset=self.ASSET_ARMV5_KERNEL, + rootfs_asset=self.ASSET_ARMV5_ROOTFS, + dtb_asset=self.ASSET_ARMV5_DTB, + drive="virtio-blk-pci") + + ASSET_ARMV7_KERNEL = Asset( + 'https://storage.tuxboot.com/20230331/armv7/zImage', + '4c7a22e9f15875bec06bd2a29d822496571eb297d4f22694099ffcdb19077572') + ASSET_ARMV7_ROOTFS = Asset( + 'https://storage.tuxboot.com/20230331/armv7/rootfs.ext4.zst', + 'ab1fbbeaddda1ffdd45c9405a28cd5370c20f23a7cbc809cc90dc9f243a8eb5a') + + def test_armv7(self): + self.set_machine('virt') + self.cpu='cortex-a15' + self.console='ttyAMA0' + self.wait_for_shutdown=False + self.common_tuxrun(kernel_asset=self.ASSET_ARMV7_KERNEL, + rootfs_asset=self.ASSET_ARMV7_ROOTFS) + + ASSET_ARMV7BE_KERNEL = Asset( + 'https://storage.tuxboot.com/20230331/armv7be/zImage', + '7facc62082b57af12015b08f7fdbaf2f123ba07a478367853ae12b219afc9f2f') + ASSET_ARMV7BE_ROOTFS = Asset( + 'https://storage.tuxboot.com/20230331/armv7be/rootfs.ext4.zst', + '42ed46dd2d59986206c5b1f6cf35eab58fe3fd20c96b41aaa16b32f3f90a9835') + + def test_armv7be(self): + self.set_machine('virt') + self.cpu='cortex-a15' + self.console='ttyAMA0' + self.wait_for_shutdown=False + self.common_tuxrun(kernel_asset=self.ASSET_ARMV7BE_KERNEL, + rootfs_asset=self.ASSET_ARMV7BE_ROOTFS) + +if __name__ == '__main__': + TuxRunBaselineTest.main() -- 2.46.1