From patchwork Tue Nov 8 09:23:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 622642 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2806137pvb; Tue, 8 Nov 2022 01:24:42 -0800 (PST) X-Google-Smtp-Source: AMsMyM4Y8KB1uZMw6VbW2owIU0hdZWNgEoY+eMIT2eK94S+zB4Z72uMxI6o9ViKqNxkK9/SiJZ+e X-Received: by 2002:a05:6214:2a8f:b0:4bb:6c0d:f2e4 with SMTP id jr15-20020a0562142a8f00b004bb6c0df2e4mr47705767qvb.18.1667899482464; Tue, 08 Nov 2022 01:24:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667899482; cv=none; d=google.com; s=arc-20160816; b=n4C7Sssu46iva/1iAu6sWlBE6mJqDzxbyx40eujBKZQrbt4S+gkmTOgwzxjuVWxcl+ R/GDKEWWGCaEnIb6T8tEIy/2B1WhtTs4BYgLqtsp9pWdqKE09vcPEz6mMpS9Cl4O23bZ 1xLAylzdosh6E5N7J/uBux6UMiaCulJDv/mwENo92wIlnqH+EVJCOoCXVbcsRiPUy9B8 lUs5RKork03OZ3e20nhuhOJVkTzR72k4uglmWR1DLrCI/Urp5cEYIo1YI0QHPqejXQzf lobcrjjMn5SevecqyvSwDDPPiMEK9+2CRVOFHbUCgQOyQLOJuQYW37KYB3Hs3adOK1wg dRMQ== 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=qBC/zqhe+w8c2MXv32aYnBZCDh2hCBt3ueKfoisA7Og=; b=pFcnz1ht21WI2yxAEYiNPP/VxZPfPUScBzK7K+tdbkNJHJt/L1bTp2dccLvLkaFfDR 55CqvTt7iZGqRyZb7gzt9S/pO7Ac32jsMn4nsBQrkepdsTMdvVQm4257Bj5OMTP2p15e yoO5kg5lGDV9yvNRqHU64C72M+rtfnNIsrabzmnKOu4HSy9EgDvuWqPiO4Uyk6Jh1c2p 0KZYQORjtw58ic5Jrk/MZAw2WD463n5MSL7fktaaacD30tBsVd9tdMjEkjSijwjGZ0PT v79TyWoWkA/27FhA6XrH1ZrLW8d2SFSRsUXjpIeuQ9gjACdGYmEFsnbds1hBzRbprwmO eQvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mo3TP1aG; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u7-20020a05622a17c700b0038c17e556ccsi779262qtk.394.2022.11.08.01.24.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Nov 2022 01:24:42 -0800 (PST) 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=mo3TP1aG; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1osKpW-0007No-Gz; Tue, 08 Nov 2022 04:23:38 -0500 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 1osKpJ-0007Fk-Po for qemu-devel@nongnu.org; Tue, 08 Nov 2022 04:23:25 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1osKp9-0005oi-7L for qemu-devel@nongnu.org; Tue, 08 Nov 2022 04:23:25 -0500 Received: by mail-wm1-x333.google.com with SMTP id v7so8422859wmn.0 for ; Tue, 08 Nov 2022 01:23:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=qBC/zqhe+w8c2MXv32aYnBZCDh2hCBt3ueKfoisA7Og=; b=mo3TP1aGA+/6qyCnthZ1d9uqmrNVikJG5cHs6qEgJsLnOMyQ+eaoUJG0vuZLzHbwmo 0EFJE36UQX4Za3z9lnfIbmeaWENpuiolyD5nq0khPqpyD28Ce4cE9HVdqm62gFoXGMn/ glapaDflqstR+ImKMvJdVDpLNP4T2TwB3gTTDEpeFOZVHwseCnYdTt4Ax/4dm3EA+rK8 3ujZb2yos3DikkwyU2p/nn3XK0L3js7Iou8E8yjRSjGJFg5XQo4tTuG0x1h4Kjc4/mil e77SMFFwAf5Ob0yVUq8yRta9hiV4SsYafKKRt60jHKUZr9RLuh/PpLOTCA0Nq1HI+pIj kKrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qBC/zqhe+w8c2MXv32aYnBZCDh2hCBt3ueKfoisA7Og=; b=KBFqfLxyTU0EFmRWnlD4NlXOd5/ez7KqlM9FrU6TVWDBx/Xf6sYQKgKcn0+Odtrb9X 2R3QnVlAACEmZPxNchZzEtSxxMq7FDa95mkJdskwa0EOzo0P8tfkMDHStxumAbUIOuSj 1YA45Js1yCwhLJLpXr6SheeI6GOxDkuwARDszdNUftDFVAB71z/UyO1XJgfdIoHnfoxl M/V+89m59PxrwkKKI9enb5QAMx9C1L69ZrZ4HqTn3IgBbhYwD3MoDg9MMlglSIzj2gCy SOG8Cem7nUYoMzRF92TcBujSuPouA9yMzwp82i4Zeoq+FOX00250StIZPCej3Wx+Jrwh T9DA== X-Gm-Message-State: ACrzQf2oN2JvEEflOcEBkWhMht9AAngKRHB8WiR5BiAm+F0TIL6sZllz Dbw+ClF3xuqbtKdtp71NVNvB/w== X-Received: by 2002:a05:600c:2116:b0:3cf:9db5:1e1a with SMTP id u22-20020a05600c211600b003cf9db51e1amr12561695wml.193.1667899392534; Tue, 08 Nov 2022 01:23:12 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j15-20020a5d604f000000b00236705daefesm9550600wrt.39.2022.11.08.01.23.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 01:23:09 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B98A1FFBB; Tue, 8 Nov 2022 09:23:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 3/9] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Tue, 8 Nov 2022 09:23:02 +0000 Message-Id: <20221108092308.1717426-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108092308.1717426-1-alex.bennee@linaro.org> References: <20221108092308.1717426-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Cédric Le Goater The Aspeed SDK images are based on OpenBMC which starts a lot of services. The output noise on the console can break from time to time the test waiting for the logging prompt. Change the U-Boot bootargs variable to add "quiet" to the kernel command line and reduce the output volume. This also drops the test on the CPU id which was nice to have but not essential. Signed-off-by: Cédric Le Goater Message-Id: <20221104075347.370503-1-clg@kaod.org> Signed-off-by: Alex Bennée --- tests/avocado/machine_aspeed.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index fba6527026..1fc385e1c8 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -12,6 +12,7 @@ from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern +from avocado_qemu import interrupt_interactive_console_until_pattern from avocado.utils import archive from avocado import skipIf @@ -182,6 +183,8 @@ def test_arm_ast2600_evb_buildroot(self): class AST2x00MachineSDK(QemuSystemTest): + EXTRA_BOOTARGS = ' quiet' + # FIXME: Although these tests boot a whole distro they are still # slower than comparable machine models. There may be some # optimisations which bring down the runtime. In the meantime they @@ -194,7 +197,7 @@ def wait_for_console_pattern(self, success_message, vm=None): failure_message='Kernel panic - not syncing', vm=vm) - def do_test_arm_aspeed_sdk_start(self, image, cpu_id): + def do_test_arm_aspeed_sdk_start(self, image): self.require_netdev('user') self.vm.set_console() self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw', @@ -202,9 +205,13 @@ def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.vm.launch() self.wait_for_console_pattern('U-Boot 2019.04') - self.wait_for_console_pattern('## Loading kernel from FIT Image') + interrupt_interactive_console_until_pattern( + self, 'Hit any key to stop autoboot:', 'ast#') + exec_command_and_wait_for_pattern( + self, 'setenv bootargs ${bootargs}' + self.EXTRA_BOOTARGS, 'ast#') + exec_command_and_wait_for_pattern( + self, 'boot', '## Loading kernel from FIT Image') self.wait_for_console_pattern('Starting kernel ...') - self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id) @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2500_evb_sdk(self): @@ -221,7 +228,7 @@ def test_arm_ast2500_evb_sdk(self): archive.extract(image_path, self.workdir) self.do_test_arm_aspeed_sdk_start( - self.workdir + '/ast2500-default/image-bmc', '0x0') + self.workdir + '/ast2500-default/image-bmc') self.wait_for_console_pattern('ast2500-default login:') @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') @@ -243,7 +250,7 @@ def test_arm_ast2600_evb_sdk(self): self.vm.add_args('-device', 'ds1338,bus=aspeed.i2c.bus.5,address=0x32'); self.do_test_arm_aspeed_sdk_start( - self.workdir + '/ast2600-default/image-bmc', '0xf00') + self.workdir + '/ast2600-default/image-bmc') self.wait_for_console_pattern('ast2600-default login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') exec_command_and_wait_for_pattern(self, '0penBmc', 'root@ast2600-default:~#')