From patchwork Mon Jul 3 13:44:06 2023 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: 698685 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp1760019wrs; Mon, 3 Jul 2023 06:48:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFNyrS5sX6dzvVrIWqQG3Qz+wdgMWjuf9KXgtGhAr+G1QtpJwwREfmTCQxz68zOWcDbG6kQ X-Received: by 2002:a05:6214:5197:b0:62e:ffc3:a9cc with SMTP id kl23-20020a056214519700b0062effc3a9ccmr12118578qvb.58.1688392108376; Mon, 03 Jul 2023 06:48:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688392108; cv=none; d=google.com; s=arc-20160816; b=qNnBkr4lgyt5faroQR6RfUO/HzoNeRk5CnVqYPr7AeVhL27KNQYA2agPZfdmSlRHW7 BhHoxyvAvF5sbBHi7ouQTykmzOVKqi3/a4v1/eUaKg339GzfmvxO+/2O5qP+l9Q67qkU DE5tBP3DTgQ/JWVuf3mr+JMyWQL0eBHJqqV7hUBScSLc+sTfHOra1jK5V9EDeqApAqqb mfoWMp1gDTKJMDd5uv9erJzvsWm4JXBRvA8DytBH+iei6Bi4KKyIIqZjOBH/uewKSugW 0viTY2y9BgfFVednQdBdTt52KF8wmAG4uDyojReMpRqT4yU0mdGOooJXhKGocHW2Ts+i vP3w== 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=yHFer7VjnRbyKbTmhJ/jIDL23JfeX2bf67sUnbUfgAQ=; fh=jLYwRthNVQctC75KPk/a+uaJp5vniuLBi6uyEDIByMA=; b=swgkzfupAkCOJuFkwoetaHmsy/BwYaYPF/5wffOi4GrH1ZD3C8wR3LQEv5IfvheE5Q cdK6Ofz/96aeAxmCi91HXQGXr8YmEeZ3tVtyl5+wYGzHq3BVESAoYQaqBi8iEwZG74xV tvH1Btj6lZRIbxRNJWBJdvuKaKnFWOwWPzWB+d+EfkXyPQ/LlZlwWjOz2pf0JQLYAQeX Ru+zMEJ1fJDJrePKU7ZF7KjMHd1kEGvLXvoF4jFh3I9EJq/PlhPb+lY6br0et8F23QoP OGAlv4Dp0eVADP2XlIZv9ijkpnNvnWCjZfAoDd/5jjOCLLh0DYoP5yjygJKrdhnXWY0s EpqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v1eyvKOl; 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 c17-20020a0ceb51000000b0062ffcb656efsi7126790qvq.462.2023.07.03.06.48.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2023 06:48:28 -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=v1eyvKOl; 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 1qGJrS-00082R-Ie; Mon, 03 Jul 2023 09:45:04 -0400 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 1qGJr5-0007Tb-Kw for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:44:40 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGJr2-0005iS-QS for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:44:39 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3fbc6ab5ff5so40244425e9.1 for ; Mon, 03 Jul 2023 06:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688391875; x=1690983875; 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=yHFer7VjnRbyKbTmhJ/jIDL23JfeX2bf67sUnbUfgAQ=; b=v1eyvKOl7Wl/dIJra8S9QW4B7tcwAoa4b3FUF/FQedog9i0o6c1rraL00TUAEjNUiG pyiKTbMOJzPG0tSTyH+u/bq2gJ0n5W09xAX41WRdTnd7sLiUzU6ZGVnaIkDmCDd0ZgmG R/G4ldIUlrAeBgyMJq0WzP3P+LbDNzBm4e8ssr+9RKwwiWACpndM9YD0sETXYWXaeygD tI2XhOuN3m+XgN5z8X7Lltdf3vlJUEf1cMZXntyGmoj3PGRI63AtXb3PQJUGw0W2bUG6 5MzNiProwJOTegOLgTz3WPWmVwZP1+9NSEkxw+/eN5ZmJvAnI65e5uiatrRvW1ReXYb1 hM0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688391875; x=1690983875; 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=yHFer7VjnRbyKbTmhJ/jIDL23JfeX2bf67sUnbUfgAQ=; b=Ol7+Pg6TGXzlKVrdfjES6St9zBXbgU24G2CDAiw7qzXKUrxEasyxYoRJ1aNO3UwXQW YY/B53N8Ukj0mh6/v0EKoPJ8DwRzH+VkSmDxJafiF0fUkaMCDPIIwPktg1zoGa2qfIcY WGnh5Ba84KGc/Gl+Qld4VCuRtFCDIywDlzjq+2ueTqo+dCSZ4ALGycl0xMqSQEdNiTnQ /xUR/dinGM8GLMRcjud6RkKsQwEkIoBCLWqaUcfMcMXEHthYbZsN98vAD/Vxh30M8XtX AnmoEPu/apmUR4DiAN2eiP3oGk6Ijnxq26YFOKPXS4TDgN9u1+1c0xdYltnC0/ILK39V V/Ig== X-Gm-Message-State: AC+VfDzQKrW+lmeeXR6xqjDAwUm5VVcjlUFahfZ+cmJg/sM/oxJHB1Cj PAKWtlQymrnb9N4cpXI//6uc9w== X-Received: by 2002:a05:600c:2217:b0:3f9:c986:a2ca with SMTP id z23-20020a05600c221700b003f9c986a2camr8815178wml.24.1688391875379; Mon, 03 Jul 2023 06:44:35 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id x8-20020a5d60c8000000b003142b0d98b4sm6485318wrt.37.2023.07.03.06.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 06:44:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA6DF1FFC9; Mon, 3 Jul 2023 14:44:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Thomas Huth , =?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 17/38] tests/avocado: Make the test_arm_bpim2u_gmac test more reliable Date: Mon, 3 Jul 2023 14:44:06 +0100 Message-Id: <20230703134427.1389440-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230703134427.1389440-1-alex.bennee@linaro.org> References: <20230703134427.1389440-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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-bounces+patch=linaro.org@nongnu.org From: Thomas Huth The test_arm_bpim2u_gmac test sometimes fails (ca. 1 out of 20 runs here) since the disk shows up as /dev/mmcblk1 instead of /dev/mmcblk0 in some runs. No matter of the name in /dev, the major:minor encoding seems always to be the same, so we can fix this issue by using the correct major:minor hex number in the "root=" parameter instead. Signed-off-by: Thomas Huth Message-Id: <20230630161604.446394-1-thuth@redhat.com> Tested-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20230630180423.558337-18-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index 6ed660611f..6eab515718 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -869,7 +869,7 @@ def test_arm_bpim2u_gmac(self): self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0,115200 ' - 'root=/dev/mmcblk0 rootwait rw ' + 'root=b300 rootwait rw ' 'panic=-1 noreboot') self.vm.add_args('-kernel', kernel_path, '-dtb', dtb_path, @@ -885,7 +885,7 @@ def test_arm_bpim2u_gmac(self): exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', 'Allwinner sun8i Family') exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', - 'mmcblk0') + 'mmcblk') exec_command_and_wait_for_pattern(self, 'ifconfig eth0 up', 'eth0: Link is Up') exec_command_and_wait_for_pattern(self, 'udhcpc eth0',