From patchwork Wed Sep 14 15:59:26 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: 605748 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp841487lth; Wed, 14 Sep 2022 09:06:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR5E0pWkQFQLkBzENAWJPvqrfQAVkuolM8OzbDj0nyaq0gQP4cEYyH9OsD7QS6yR//0extpk X-Received: by 2002:a0c:db05:0:b0:4ac:d6ad:379e with SMTP id d5-20020a0cdb05000000b004acd6ad379emr5737412qvk.121.1663171582310; Wed, 14 Sep 2022 09:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171582; cv=none; d=google.com; s=arc-20160816; b=dxU/PgPFiPuGo74RfLQ1P+yVH7VY0Z57eCEOM1+bR04E4y3FQSxwLZdonygwW71BUy TDvUlkla8Jn54UbzHd7ctorqArQB68llomSemRAxapbsnkxOBc8xqrfH3pkdpv/ndatp mlPM1n8eZILjDXk4tgn1Tt47Q0oz5YEjeltHpuRz/qSkGNzNCQEsdRo8NkrhvEQHJ5AA 8KQasabiwgvDqoZ/GZ+kP3awBW1H4wYsa5j6xZv2/EvRWzrCagLQbrU25yKVTQUWT4G9 PXeMKblUkDGC4btnsVlP3F1SQR4OG4H44KKf9KgTS44JbcS9+7y5AOkrbfydyxnfTLyZ Qtzg== 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=kZdq/uKjk12WdalK+7NLnICP9eMfFlhN/OCSVSt/d/Y=; b=LvSTgitZBXhT5HB8BRL3f2Z+hMDmjCBn65NOoGrjQhpl60zxGH10FU0nlEwCTgSUTI cPrWFFfj0MuaUSm01SK+OSxDu621m7XrFk5QLBu9kAxS6/DW6xS3fLB5yR2erCf14axk Fei0P4lh6ycHi11R8Fz/BJUcWkate2o2Ohfd5v7xCVB4+lWxyNSB7aKVFt0OM73KzVLZ UkrA10T4H10HvjWFrgEtYvhzr/Wg8zqH9kpT9hZOIk3W5OqqRA/OSyc/BoRDUppG9xlm fA/QPdtaFm721pGwuSfljnu+JB/lQs3VCUvqAM19q+0Q8Etz0YrlIZ04oQM0SYFfz6eU 0E7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iaC73sLP; 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 y14-20020a05622a004e00b00342f823157dsi521129qtw.235.2022.09.14.09.06.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:06:22 -0700 (PDT) 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=iaC73sLP; 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]:59484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUu5-0006cr-Q2 for patch@linaro.org; Wed, 14 Sep 2022 12:06:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0006TY-Pt for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:34793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUns-0002mc-Cf for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id n35-20020a05600c502300b003b4924c6868so2485821wmr.1 for ; Wed, 14 Sep 2022 08:59:55 -0700 (PDT) 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; bh=kZdq/uKjk12WdalK+7NLnICP9eMfFlhN/OCSVSt/d/Y=; b=iaC73sLPBN9HQvbiYfjSGwo6G5d52DPu5Q0zWbFak+CT06xmrthNRkG06HrvEMexJC Tpc9vmjBqgN9F8bKAN1Ipci5bAWVZkL/Z4okIVYNSmYYJaAnjtnZiMx+01hAT8uTjQqh AARB/cIbaxnPhO0v4QPKEBv874+BGyCLPJi2n4j5Kvglz/AwM1jVmUZ8jOkswjykAfRQ IkV5f5LtWSBfiGc8/99GWqrCqKFJ26bG1H2hdG8xj/gHufW8AQ1RIQhkIIQcHzxipK/x PvmzxUokR2JivltsXMGTmN020ttGYuLpzr17DwJUsb+cPpnMnJvC0/tyGfr8N2U1O95O Usug== 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; bh=kZdq/uKjk12WdalK+7NLnICP9eMfFlhN/OCSVSt/d/Y=; b=f9QaQTUpTpRxj9KWJyZic0HRvVVuqSxvBISQ4ZIbJy46jm6DP0TVta/CKHkvQcqdil vDcOJWk/16fm6ZpMQxEGFif9rNASzPf7+7P0Brpp996KD9RbwH5S/B3YfTAavp6fTBa8 zgW98+MkJjVEDe8PMAqMNmde1lZWvm+kwQre7LCaCxVrAaEfJKr4qYNhbxfDvqym1y6C 2W3a1e0MmESwV/Frd2lT9nf2irRg/hA3RuZmYJmE5RBHUF20OqE9iLkDyFWqsbHmvAFW /vpOrv66wuMGgoEoXHYaqZ1k1buAJJ0CxtfyzziNdjJ4JZ11KVdMTg76IG1CLZ7UJZXz wtYw== X-Gm-Message-State: ACgBeo3IMeGD+QEOO451jwmgLxxUo691TOdXdQtVT2TgT3El+J/munIf h5M4ruGZfks78L6PclIaCdVurA== X-Received: by 2002:a05:600c:3492:b0:3b4:9fcc:cbb6 with SMTP id a18-20020a05600c349200b003b49fcccbb6mr3075520wmq.42.1663171195069; Wed, 14 Sep 2022 08:59:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bt4-20020a056000080400b002238ea5750csm16849072wrb.72.2022.09.14.08.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DA3E61FFBE; Wed, 14 Sep 2022 16:59:50 +0100 (BST) 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?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 06/30] tests/avocado: split the AST2x00Machine classes Date: Wed, 14 Sep 2022 16:59:26 +0100 Message-Id: <20220914155950.804707-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" The SDK tests take a lot longer to run and hence need a longer timeout. As they run well over the 60 second maximum for CI lets also disable them for CI as well. I suspect they also suffer from the inability to detect the login prompt due to no newlines being processed. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220826172128.353798-2-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/avocado/machine_aspeed.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index 65d38f4efa..0f64eb636c 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -6,12 +6,14 @@ # later. See the COPYING file in the top-level directory. import time +import os from avocado_qemu import QemuSystemTest 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.utils import archive +from avocado import skipIf class AST1030Machine(QemuSystemTest): @@ -176,6 +178,20 @@ def test_arm_ast2600_evb_builroot(self): self.do_test_arm_aspeed_buidroot_poweroff() +class AST2x00MachineSDK(QemuSystemTest): + + # 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 + # have generous timeouts and are disable for CI which aims for all + # tests to run in less than 60 seconds. + timeout = 240 + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.vm.set_console() self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw', @@ -187,6 +203,7 @@ def do_test_arm_aspeed_sdk_start(self, image, cpu_id): 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): """ :avocado: tags=arch:arm @@ -204,6 +221,7 @@ def test_arm_ast2500_evb_sdk(self): self.workdir + '/ast2500-default/image-bmc', '0x0') self.wait_for_console_pattern('ast2500-default login:') + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2600_evb_sdk(self): """ :avocado: tags=arch:arm