From patchwork Thu Nov 17 17:25:21 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: 625489 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1005991pvb; Thu, 17 Nov 2022 09:26:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4+skd5tBiV6w5sN+j6pa0RphdTggWxq8IIrx34vAdTAkB1q1KSlpSs9XJHhzrjxxVmEmbd X-Received: by 2002:a05:622a:590e:b0:3a4:fcde:733d with SMTP id ga14-20020a05622a590e00b003a4fcde733dmr3230149qtb.269.1668705992879; Thu, 17 Nov 2022 09:26:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668705992; cv=none; d=google.com; s=arc-20160816; b=M0FbgJl9/FjBTSu/5mHlZKgGR8f+LGDMOven0izlkgPWdbdh00Gfy4o0dSV54wJJIl apDcW4nYvlYUhJSeTkGTM04+rKelF8DVhpA/NYlKZ1VnZxPqe7k2235WRbyJzToFGlEe MzTZP5vgWWatu0+qTuOXrJiDdoiUuknnUB/HvVcPe8iJY8xIqXdPKsL9Imj654nayoE3 DA0ybgtc5ti6S24Udnxqqa1XOOHHyFlfeIj1ZGtUtzPpd6KdRlf1sdKIuJvoE5Ly9yn4 YB+laredLYekNaegQaIgCQ+KTYpCthWFeCnknBl4wQSVAlu7ia4ErZOq+IIp16Cji3mO Phug== 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=TUmxKKupzWW40b+PE4O2JXEtmFVLtKng4SrYWCxYHqo=; b=Qyey5gbZaz288IlxcHI5D8r8vcWzveN4fvmLEwpVCeXVnKZ4jI0MdLBTuqkZCYKgNh H7U33TF/ZMuDSDBrCx7Diat6dsNqH0IVwWDMZLgNPGd/LJhJTCf4VRAatRhFcmuEjyX3 d6dO+ZZSwmKRqxjDvxsr5s4XnR49pMmfoma+iBu6cVftzB+XBAXztlWi5yg+mHEJSMi3 o4dfcthD7VicgD63PtKh+2ybXjjl8n5TsKiHq8m/026AtS0ZZuyPiMB45xtUcJeQ/Q5b odJqsZwOUSEjA3ZKCpDkySatkUzxQMbovPsj/r8241RbdDGqB9V7f+4uwlzT1kZcF2ZJ 6JcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DegIAvdQ; 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 i15-20020a05620a248f00b006fb1450b194si743920qkn.309.2022.11.17.09.26.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:26:32 -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=DegIAvdQ; 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 1ovieC-0006Nt-Ce; Thu, 17 Nov 2022 12:25:56 -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 1ovidu-0006HO-3l for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:38 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovidr-0006DU-CZ for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:37 -0500 Received: by mail-wr1-x429.google.com with SMTP id bs21so4977417wrb.4 for ; Thu, 17 Nov 2022 09:25:34 -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=TUmxKKupzWW40b+PE4O2JXEtmFVLtKng4SrYWCxYHqo=; b=DegIAvdQiHWEZQiTfemoqQ0Gpyp1faaDm5g7reLzxrMBiKw0AoB277uXcEqjInqJnt L+En6UpTlL+kbZbkyI522UBzi+GXmzcQ4DpD3st3iyzse2JyLd02xIBKGDUsrBOHm/J/ I/KMdNthDw4JiCVaQ1JrnJ27XI7gMzlaTmFxnSeMaecO2tzJsimmAg0NVgK9aHYx1XGJ 89IvG+8rOg5OcOat1TbyIiW/W5Nmu4j4C6ax953gHLo8os8mnEX42vShbJ5cZqUBwzHk 9vnIeaMOyQ6BfD5RwFOL5Z6czCcATF+KS2f+dM9SeALD/RZ34AieA2n9tDlB5ZqPM8y7 fivA== 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=TUmxKKupzWW40b+PE4O2JXEtmFVLtKng4SrYWCxYHqo=; b=BPCS9upQkf/CVhOK8WZfLAZ7XTVdM26rQ2/jNYBQeK1vSTPuDC+r96YQ6Yg1ysMaZa eoyqR3NCpER8JhFyIzr5lzqyZTusF267E/0skv1men+euHddyi6J4VOrdR4bZWAZNl5S p+qCw6m9RcknfmZTihH+LLqCmmD6KkRXUHJRIF8pEDOD9lp4g6TZpYgM7jZ3d8ZqwikP PLeGpLM81h90Dxnq9QWv7/MROgabsHhV6HFEPFLMGDgsFaFadQn0IL07Bmg6ioibdvfe 3N0KhI251xB1+WfIHQQaKUipJcEm4PRJJBssnxKBEetijkz1J8qx05LHh7fZsWbr/4by 2zsA== X-Gm-Message-State: ANoB5pldWtBP9PlzQjVpCe+UdkyOkzxwjldqWI5a9diVGqnNAX7K+fSA nwbWXgAyprOV1DyMSs1kJjz2JA== X-Received: by 2002:a5d:4c4d:0:b0:235:25b7:5084 with SMTP id n13-20020a5d4c4d000000b0023525b75084mr2119232wrt.135.1668705933801; Thu, 17 Nov 2022 09:25:33 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l24-20020a05600c1d1800b003cf878c4468sm7265846wms.5.2022.11.17.09.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A7BE1FFBA; Thu, 17 Nov 2022 17:25:33 +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 v3 02/13] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Thu, 17 Nov 2022 17:25:21 +0000 Message-Id: <20221117172532.538149-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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> --- 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:~#')