From patchwork Tue Nov 22 09:56:01 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: 627506 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344816pvb; Tue, 22 Nov 2022 01:57:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf5/GtMDk80pWlE0Z5CR4PFDu+YMJTgcXWAi3F0CJe0Me/AiY0ZrOHp7kR0TfroPfUeEz9SX X-Received: by 2002:a05:620a:4708:b0:6fa:ada7:e51b with SMTP id bs8-20020a05620a470800b006faada7e51bmr5358684qkb.674.1669111077881; Tue, 22 Nov 2022 01:57:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111077; cv=none; d=google.com; s=arc-20160816; b=MtuPY1x0CTs89jB3g4KRHe9A+S0PuSOvC/Jo8AeB5F0buA0zOKTRCQDFHMEWcvmJ6/ edG/GIKIED8mSvWSRTKoUtJhVmgldkYI54Qov/bzuBfIRAGHQkkoAAzwHwCGYHa6aWRT jNK7tbJqUoih9DYE4Aweh4OOwkpesKj51rjDxPRILTvmhjC71U1T5LDjwa3mL7DYPv9y k52gJ7UiJc9WfTDGCYVNUsZ4YdgxXcmL9sKiyQpLM5Q7WFGBQOdNzWxAUJnGn1aLouwD 6AdmRxGEg4sS9nyNWRmrUaiiUxcWw2OIrONMegNJJDNayaKTU46vNQHlA6pXjOuM2TmS VcPw== 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=xSqW2kbzQv1qGLnYM3Z+K0PUcGFO2WEC4eYGpHtzuek=; b=lfhL5PJoLwBGVyfuUplfmtuhOWFVKeFjOevRtQcTU9MH0c/9ctKl/fbA/CtCdOCbZ4 YfhURtIzQpE5rpUg3ceZ4TBgWuaKNUzVJ+GTthGXqVFh/+otOZiBW8igzIsVbWbMYD+Z 7wDHAevSiv6ejPUOfAHSSlHA5S2O6SvFin3fn7lIrWknZe9+KeEy8JC5SdObJTfziilr 1PYkHSUtDYAGyXhMxbSLPjILREdMw6AIgi5vHIDLpZXmrok3isfo8kP9JeDL8srbaao+ icnXa+QDhwgfZ9g7SDcdEiEO8ckhFaZP0hzZQdEFE3fEAtMTlW3ySvlCtIB61kU8YpRu FkpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fC97xsCf; 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 u22-20020a05620a431600b006fba8e59b7dsi8165763qko.276.2022.11.22.01.57.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:57 -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=fC97xsCf; 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 1oxQ0p-0002NR-Vv; Tue, 22 Nov 2022 04:56:20 -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 1oxQ0n-0002I6-E6 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0k-0003dL-4y for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: by mail-wr1-x42a.google.com with SMTP id e11so10958718wru.8 for ; Tue, 22 Nov 2022 01:56:13 -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=xSqW2kbzQv1qGLnYM3Z+K0PUcGFO2WEC4eYGpHtzuek=; b=fC97xsCfDnEnBT+1LBZPImJdJnTN/4ddCCxoIt1f43PCUn7Nr62uEN1wf3xZZotQNs lY7rIgtkh1qadwiPu/uEfgPf5X6tETz+f7MKd9IrTSXFrI9qyIchEQLvwQB5cdwJdYIf J4z1xtBi6cqgP8s+XGQa3ysr5RUX7pZo2wW4hZzoKhAejMLv2Plh+6/BDbyDbVoJFIgn 9y+nIKhjByVta/OBHWGqEP5u4t7b+pSPYdyJgCFDiluZwwb1dosjqQcGVqjulNTHIUSp xbPPI7aYMq76VhW8LVPyN8H3nmVBfIK20zrVdZ+2F6wcLE9NcCm5+ZdaAIq1SJmDqhvP LKXQ== 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=xSqW2kbzQv1qGLnYM3Z+K0PUcGFO2WEC4eYGpHtzuek=; b=p/kgzxOLQORAZ2w3NuK1016ucKpJKeR1xWeQsAY5mFDdT11dJgl+03NCWLQI5BnmHY +KyA4WX2LJZxl0g16YRaKqXhlhYZLcj+UyFlvdMJP2xrpBHgZEq8Orhu1NzKb3/whM/l 1KP3CMahlafJQ6x4WLyXq8dIWXWuWJJXyS+ldkcnmgKC2aCSIjOhJl1g5lzIENnIjFC0 WO4iBs4MF4Mf0VUUrDRy5LJmdIDHcGMDCD9vW3/kwzc+tvPC/R3MFAR6/j0bDpbdb4dR aYaztc0FJYV2oeIyuDmTPEidJzGAbWfkkl/hBAuBX73E40N1/he9R06NaogFpqF+gzsQ LH/Q== X-Gm-Message-State: ANoB5pmV3bOJCmAMs9t2Hh6ayQ8kR0m08IosMae2K1pyqPwyrgR8ll32 /bwlSipXsHFYaYq/9PwNa3N6bw== X-Received: by 2002:a5d:42d0:0:b0:241:d8e2:868d with SMTP id t16-20020a5d42d0000000b00241d8e2868dmr4960231wrr.671.1669110972339; Tue, 22 Nov 2022 01:56:12 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l10-20020adff48a000000b002366ded5864sm13468445wro.116.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B7C721FFBA; Tue, 22 Nov 2022 09:56:10 +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 v2 02/11] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Tue, 22 Nov 2022 09:56:01 +0000 Message-Id: <20221122095610.3343175-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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: <20221117172532.538149-3-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:~#')