From patchwork Tue Nov 15 13:34:32 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: 624830 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2978020pvb; Tue, 15 Nov 2022 05:36:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf5x8nnP4MR5yEY5WRClq1lSMLF4y83tWJOJIoZlo6bRVMslIHevsx4DU9g+XFW/HWDi1qiM X-Received: by 2002:a37:c245:0:b0:6ee:909e:ed6c with SMTP id j5-20020a37c245000000b006ee909eed6cmr15141161qkm.264.1668519406106; Tue, 15 Nov 2022 05:36:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519406; cv=none; d=google.com; s=arc-20160816; b=EoYJ7+Y7DKJj5S8KlNwUD0Xw+ciPegR/9ewmpHeDQCw85aexOyqvCjJq1GAHJFg60X 1vEqOipp3Z2Hil9ZY+IvAS2UfMQaDpRIE2l8HAbnIlba703YJkbaBNy/sOoTWhLPGGjg uRu+N9MgSDzfG58EncvrN3SvRglmSsVGJUlmST2e47VKdiwTDjvDpsDdyHOOP5QfR+pG wSdiEOkr+j1Zh2DjcIy+4aiel2syuisCWGXA+4hBsTBybYw+oK8fJHjZ+KPp8YU6bW2H U63PBj+NzkvmIXVPGI3V6YTSaXE+XcySvRd8DZHd27JmDJwoQTo/im6j9/vjTWVdRbJH vEew== 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=YEwk4mG4SDl4i6e5vGNuhjwgLf2dcKmgfAwFXe8VUyU=; b=LtQX120C+hnP3/xU0LbI86jAFTmJKj2SqP+/KJlvaQlehNOjV0Y1+YA4oPsMoevhn6 GyOzyrEWQlelX/oKuZIcC4YKul0bJddFMzm5pns7pHTjyrlbuOfIQesiaKHe7u9GScev ryGFoiVut4zA5smDHGwy2CXBOvxEXUCKNxl6jZK2bSh+/K0svHbFr5FepCvne/2HpOw9 tQXmEumVbZSqwWcPSwlZWmA17kF/NS17j7mAScOTR7XX3PAKYJ0whfWtTwFl+4zGyaai JCJHWaKQYf/ZqHgMVvSdsqdLgQ8Y8Uuwa6ByUahK5fmpU4U0XkzhDQ5YTwVWRhTsg0tX OdMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qKQkMNyY; 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 g15-20020ac8480f000000b0031f0e2230d5si7017857qtq.609.2022.11.15.05.36.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:36:46 -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=qKQkMNyY; 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 1ouw6z-00076p-Rv; Tue, 15 Nov 2022 08:36:25 -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 1ouw5O-0006I6-S9 for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:51 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5M-0004Id-1U for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:46 -0500 Received: by mail-wr1-x42b.google.com with SMTP id j15so24315719wrq.3 for ; Tue, 15 Nov 2022 05:34:43 -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=YEwk4mG4SDl4i6e5vGNuhjwgLf2dcKmgfAwFXe8VUyU=; b=qKQkMNyY3q5A21V1pJiD/QReq4xatEQHJwbGWmHW0oHcJZhPA+hoywlhLsITII30TE VuEjXqMFvja/IRyp36QmK4aSCQKJOzZBDdpz0u0wpL5Sk1K5sQQjlTS3NK4l1cyCoWDh SnSrvSnftaJBNuLzW+U+EaIMqVa4wKxQpQHxCFfqTX+r8rbG42JHkPHdkzZuClGvmXU7 9JXRB8zUVqM1ihLu0Y6A0361bBPe3emUAidNXVpUENKjtdSg7LmaXw+VqI5VnoTeIM7n aODDgj/yVMDloyjiAngIKdl9pNNAL6RJWlmO7TmcH4VjpX7ZiNSppaZBnXo38ad7E0AD /PpA== 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=YEwk4mG4SDl4i6e5vGNuhjwgLf2dcKmgfAwFXe8VUyU=; b=e8VFoNArhNdL0Xdbs3Ck9sIkUv+dQXnK9X0AlDBOGmRq9/u2diUAU1mjFJUCba8OFv JUAzQyiCOxVm9QEL/puWlDjivaM/2fAklawsyqSCaYZHHCiFafqW1zu4ccOt46TS/iKE 0hqX4iaXCBdLfx3oACX/9NK3skRpu/nvLjCD9YnFEf9pj18bMPswQOP7CoNVsqu1l5ev +w1NUhLHxDyooICD5X9JesWPpdHdNZCJHL+Pp0d65kabJ+DmaDHCO2vxaeSp2jkjtaPW JuO6h4ZJf9jbL7uYtiZyG69WGCHQCIhclrc02LBG5T4OB23EYVy9/bJuUf7QSVoMcjK2 xWAw== X-Gm-Message-State: ANoB5pk9JH4qupNjFeU3nZN2RGcQJ161fJmsjRmXwpCE8wc4kT2ay7zx ymOtuGJLhKJRqrpJniGyuW5rZQ== X-Received: by 2002:adf:aa44:0:b0:236:651d:60d4 with SMTP id q4-20020adfaa44000000b00236651d60d4mr10739076wrd.609.1668519282567; Tue, 15 Nov 2022 05:34:42 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g10-20020a5d488a000000b0022cc3e67fc5sm12265749wrq.65.2022.11.15.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 84E141FFBB; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/10] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Tue, 15 Nov 2022 13:34:32 +0000 Message-Id: <20221115133439.2348929-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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 Message-Id: <20221111145529.4020801-4-alex.bennee@linaro.org> 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:~#')