From patchwork Fri Aug 26 17:21:04 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: 600291 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp555678mae; Fri, 26 Aug 2022 10:25:20 -0700 (PDT) X-Google-Smtp-Source: AA6agR4RFMKiFuRB6eXCBxj0Gw+6toVTHw4i6JUJi0mrzkhj060Tg72TCa8ezwfXKkZF/skp/OTZ X-Received: by 2002:a05:622a:344:b0:343:6a5f:321 with SMTP id r4-20020a05622a034400b003436a5f0321mr671010qtw.204.1661534719977; Fri, 26 Aug 2022 10:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661534719; cv=none; d=google.com; s=arc-20160816; b=AFG3b96Hi+gfSK6ga45u7ILg6axL2tCJ5YaCbJhgbwkhL68TXgN6ggNeFglh15gdQ0 M1B3OpTqJ6MnwI7urjEBEppkQkYXGPhb6zXE54ZhbRp3iFrqpC43/hiMZ44dALgv+Wcv 2GL9bWVI4WDBD5uD4r/h+zwqQKLT45SOornFwg/evBlJjG2m49EtnUtBzR+zo0E7Njse l0Eyam6n5/n+CBOKqz8mcDccTI9oU6g8MDAaV2yz0MfnGo4s307hB6p5MBvSz9WCNrXQ yeVPMZeOtd99OTKe1g86hy0AFxaNiM6G3dy4mXkyum1hPm06yihdCkQXd+wkoWDaIRlD D+5g== 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=ikIbvIVZc9eqSucgMZ0p7NFEFKoNahKLsiVkLjE1kiU=; b=ATT+pE/j5wMj3BxDrYbl9iwiuZvC6s9c1UJOiiLjf6xhUrLD1aeb8PRzywvBPiPdEP TN9QI7LOTZLy+jWEDQscfKgnNHdOCtBH/PjjBBaI1iVNlAdLEecJrjX0f/+IqidK42Lh PRo6J2T6zZRrPLF1VLhKZPI4gZ3x7CZqDSjSRffWa2vN6nRStMspcgU9S4UjhjBo9FXw NuUe8gpwOmvjYcyo7vA7w8WPOWgaJPSu8WF8W9FvrZsLvyYlCnqRWM8STzYhG6o934d5 7c9qD58pdjBCF4uG1Rg+ZIYz1GNM8Pt+tDI1aViRYIsOK5NxmmQbPWoDcemyio6tsVva Mw9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fH6Cvtf7; 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 d17-20020ac847d1000000b00317a67e345fsi185160qtr.202.2022.08.26.10.25.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:25:19 -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=fH6Cvtf7; 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]:59544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRd55-0001cZ-F0 for patch@linaro.org; Fri, 26 Aug 2022 13:25:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRd1S-0004Fd-Qe for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:35 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40787) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRd1P-0002Jw-SB for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:34 -0400 Received: by mail-wr1-x42e.google.com with SMTP id h5so2551350wru.7 for ; Fri, 26 Aug 2022 10:21:31 -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; bh=ikIbvIVZc9eqSucgMZ0p7NFEFKoNahKLsiVkLjE1kiU=; b=fH6Cvtf73fAbc+35zSA77evkyaBq3QUYI7BLIJc7HQzBpvr5sqIaoloyO4lfUBhnRY nw5qEyTU3IK70V/Y4g/zsQ7y9YQ4rgH39bWC4XlAo/QsoSqKUTUNxvrhrERAeX33q4oG UQ2Vvl9wf3IgCLUnNRdBoSCq2HUVlg1Uj9bwrhfP2Vkzoi9KNq9qshK/yHg77SEAHRB/ 3uAhW+OMcKo9rITWv04qm3sa/9o8DW4p1iz8k5Ife2p6PL0nO07alYsosg9dmC4Fttbs NnT1y2yX5nrG2qSZJVkX2yC2jFpGgv/N0DIXjwcgM6Il0XFDEZ+bNBdLwWyzJipq9qDs tQTw== 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; bh=ikIbvIVZc9eqSucgMZ0p7NFEFKoNahKLsiVkLjE1kiU=; b=v14r54CrA3o6L+Uh2kTNV07P7M74Vj2CqKYSCaQ1CmGrIsEHaH1aQy2Feonm4seLmx 6wICxIwa7zA1nvgKSVkwi5rmkfsqF3bCR4Loh8031wvhithi95zcvQ+Z0wbgqNsDfK7N W0J62YlHa0I2KViYteIqlMQizC/gmJ8qrd67s0Vpxv+bf3bvVRdEWC2Wcp9JAC+zBGLa dmye8yyoCJP96RkDq2k4UF2m/3Fvgdm+MQEntZQbMhqFtIN+GoH01mQ9/Wg+8Z/WGeFq n4Ozhj777Cui69HUPpmN1ZGb0BCiGA1PlNF/hQaK4ObYYEnWxRpTZqB+cfJzxBifQlvu RtQw== X-Gm-Message-State: ACgBeo2bUnZnZ+BKfov/cMnKnwX9eNA1Epwk2pds33gKuOzbooWq+Vok q6zf+fcYvv2DheTkhEOiRChW6Ra/fvjWvQ== X-Received: by 2002:a5d:47a5:0:b0:225:5f81:17fd with SMTP id 5-20020a5d47a5000000b002255f8117fdmr381622wrb.280.1661534490169; Fri, 26 Aug 2022 10:21:30 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q28-20020a056000137c00b002205cbc1c74sm225985wrz.101.2022.08.26.10.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:21:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C371F1FFB8; Fri, 26 Aug 2022 18:21:28 +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?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 01/25] tests/avocado: split the AST2x00Machine classes Date: Fri, 26 Aug 2022 18:21:04 +0100 Message-Id: <20220826172128.353798-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220826172128.353798-1-alex.bennee@linaro.org> References: <20220826172128.353798-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, 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 --- 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