From patchwork Fri Nov 11 14:55:20 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: 623736 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp827329pvb; Fri, 11 Nov 2022 06:57:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf6bT4zi8ynIRbxY2LrgSB3k3zonYUQP0NFO5ZLhpKkZcbq+S56bn76Pgud5y+W+HNwAsHN+ X-Received: by 2002:ad4:4e2d:0:b0:4bb:6419:ecfb with SMTP id dm13-20020ad44e2d000000b004bb6419ecfbmr2055655qvb.109.1668178623435; Fri, 11 Nov 2022 06:57:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668178623; cv=none; d=google.com; s=arc-20160816; b=Hf7QJP4gdZO/w87hJ9HSSS4VAj8tqeiPEkgEULPYJZNymhleTeG9ydWJeA/smfi0QD 2riCLmfTxVGQiD+jKLGWKALkrEZeAgbK12CevX6XTie3aGxV33GyR5jJFR/f7IG1JIei 4k9R8t+HW9Hzd50J8Md56Lri6C9l9x8XWl40vWWiKlnY7XugEc/2sFvV0AQn1ydht/ei mHuYEwgVB2XELJ2boWpQN4ecxhw2/OZewPaRN+se+UEfv3/12MmuLaO/RAGT2hKFfIQ0 QMGixqtzQvut6WVxHgRzwBUZEIiKBfpGHeScGn07IchXTXIExoZbOvxAYoDjFfpZuGjf HEOA== 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=VjK3ewShJ7JO7Wm/pXjI4CG+vE4MsE8ahWV3p51F2M4I4UdCoeVv7jHqB3BN3rjXTs hR0FegE1CQpHEE9yfWQ2OQhEaniFu81Ptsgq2OjZ7/+/G9bOnVmdvhsHmRZUdTu2i8WU 43sFZVeHO+XKRVWBQwMJk44OfmZ6xzvpyXTtxNcP8fpgurtM7TE/G2pWtF88lIXIOmLQ pvIw/WNGVLfnkLxhb7NiPQHWP6gyeeTuA5Oe3CqPgSxHZ/2p//dil0A/VKhsezhOkmxD Uu8bwx/dO+olFW557S8jhPjHslgk37+HBkLPJVRMHnHlo9158A7f5cnRwkAdezfLsPfp gInw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gp5Zjraz; 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 jt13-20020a05621427ed00b004bb92787ecfsi954996qvb.108.2022.11.11.06.57.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Nov 2022 06:57:03 -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=gp5Zjraz; 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 1otVRc-000761-PS; Fri, 11 Nov 2022 09:55:48 -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 1otVRZ-00073e-IO for qemu-devel@nongnu.org; Fri, 11 Nov 2022 09:55:45 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1otVRR-0007wr-E8 for qemu-devel@nongnu.org; Fri, 11 Nov 2022 09:55:45 -0500 Received: by mail-wr1-x42e.google.com with SMTP id o4so6796685wrq.6 for ; Fri, 11 Nov 2022 06:55:35 -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=gp5Zjrazc6exjxIuGhuX/4RSkoj+jz2xD3mKno/aoPch/sgpDIxGdBR+YQajbE7/aK ZfKFqP2UYTyZQ0JSDWshKsSZMrW5s+2a37zEI8H5qHLiRV6y8OjGzkltZEU/CvfiAWPR Ji6twZe1TnxjoPRo8GK5pFM0YQEwC+g2e0ZagQYLpcuCa8SoWT/sWUrZXMVoqV7TcyFB PR0U0I0+Xxk9AVUg9ZoGHrfh3KZFonUktDUAYZ7FrHZO3eRkQsMy64qnpbXR490dlwYJ FOcSv1cDG1IIrS/x5y4C7buh5ZQWzhZUjNrYM2STkc4GT4QAXrgU+trxkkWC4ymFAmur X6ag== 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=7A8tSvcCAcmXTQQE/1lAxjk5GJtTlBkl4QL9hxhQwcv7hOYTsvkvVpVOEGKTjefbfl ybn6EuR2xmAs5tTxfbOac7RYO8Ir+Aaj8cini69dufQufLJgCxQ9oEjOMbEz8u5pW2P9 sqOGsVfPtWX7VYlQkP8nDuuerEoEajIg+lnFDcVJupuPEchiSDiP6wcqOBMfduGQWHRH 8Sg7DD4FkMm7F1dMNARSUdoewa5X/rs4jAxr4zjvi78/cbolxyEhgg5MvcsCJSJZGSI7 LXicW/J894iUbxPZXsvCwB6vvPWFokll1utaLkMdCzSTf/+3KP93VSlPNXRBqh5JOtX2 1m5A== X-Gm-Message-State: ANoB5pl9GNfsDk+2TCo6AwikvylnNByk5Hgc4d6JWHxNQQYM0hsgh67T SIEhqPl3+Qlugz1uDixXiCn3aQ== X-Received: by 2002:adf:e78c:0:b0:236:704f:29f4 with SMTP id n12-20020adfe78c000000b00236704f29f4mr1486225wrm.11.1668178534336; Fri, 11 Nov 2022 06:55:34 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a26-20020a05600c225a00b003c21ba7d7d6sm2941674wmm.44.2022.11.11.06.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 06:55:31 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 44DB01FFBB; Fri, 11 Nov 2022 14:55:30 +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 v2 03/12] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Fri, 11 Nov 2022 14:55:20 +0000 Message-Id: <20221111145529.4020801-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221111145529.4020801-1-alex.bennee@linaro.org> References: <20221111145529.4020801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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 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:~#')