From nobody Wed Nov 12 18:26:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1572022714; cv=none; d=zoho.com; s=zohoarc; b=X7nN/qWx0dxlkVLeWrENZExs5ToqWniN/hF9OJ3WoWWE1Wj5Cn69dZlGTMhFfUeRNr0c4QXef6ZZQcDE5AVkaHYjvNf31VwVtIF0IbSqgwc4BZzRWMfSVNR2QpuauAr5rI4qFjSXvYA9Cn5cZDd43t50+4SchdwDlPeu+fHplNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572022714; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8qxQhrRqYlhgzHCvoZCQwOSb0nyZQP1U+/wSV2NX9K8=; b=a7e/VyNBtvVZOfHkUWNTYx/+Fh6xOm/7aJUnhkPFFeWN5bJ4349VDmDc7pLmd/6QDOFzI4049mzOM0WKHyJzhnc7ZRWufiC6D06ZKSNPDRRhYXJz8bVPKcy7VU7bQo0bQe4ioW+JCB3FavqdFQ89XLI6LQzQPf9V50+sLIsgMMI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572022714017471.9836609554253; Fri, 25 Oct 2019 09:58:34 -0700 (PDT) Received: from localhost ([::1]:34694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO2v2-0000xh-1O for importer@patchew.org; Fri, 25 Oct 2019 12:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40691) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO2ij-0005Af-RR for qemu-devel@nongnu.org; Fri, 25 Oct 2019 12:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO2ii-0002Ml-Cy for qemu-devel@nongnu.org; Fri, 25 Oct 2019 12:45:49 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:34491 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO2ii-0002Fg-54 for qemu-devel@nongnu.org; Fri, 25 Oct 2019 12:45:48 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 471241A21F7; Fri, 25 Oct 2019 18:44:30 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 206F41A2290; Fri, 25 Oct 2019 18:44:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PULL 20/20] tests/ssh_linux_malta: Fix 64-bit target tests Date: Fri, 25 Oct 2019 18:44:22 +0200 Message-Id: <1572021862-28273-21-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572021862-28273-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1572021862-28273-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Commit 9090d3332cdcc added tests for specific to the 32-bit machines, which inadvertently make the 64-bit tests failing. Now than we have this information available in the CPU_INFO array, use it to have the 64-bit tests back. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Markovic Message-Id: <20191019153437.9820-12-f4bug@amsat.org> --- tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/li= nux_ssh_mips_malta.py index 14b8a5b..aa12001 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -43,8 +43,8 @@ class LinuxSSH(Test): } } CPU_INFO =3D { - 32: {'kernel_release': '3.2.0-4-4kc-malta'}, - 64: {'kernel_release': '3.2.0-4-5kc-malta'} + 32: {'cpu': 'MIPS 24Kc', 'kernel_release': '3.2.0-4-4kc-malta'}, + 64: {'cpu': 'MIPS 20Kc', 'kernel_release': '3.2.0-4-5kc-malta'} } =20 def get_url(self, endianess, path=3D''): @@ -155,16 +155,16 @@ class LinuxSSH(Test): else: self.fail('"%s" output does not contain "%s"' % (cmd, exp)) =20 - def run_common_commands(self): + def run_common_commands(self, wordsize): self.ssh_command_output_contains( 'cat /proc/cpuinfo', - '24Kc') + self.CPU_INFO[wordsize]['cpu']) self.ssh_command_output_contains( 'uname -m', 'mips') self.ssh_command_output_contains( 'uname -r', - '3.2.0-4-4kc-malta') + self.CPU_INFO[wordsize]['kernel_release']) self.ssh_command_output_contains( 'cat /proc/interrupts', 'XT-PIC timer') @@ -221,7 +221,7 @@ class LinuxSSH(Test): stdout, _ =3D self.ssh_command('uname -a') self.assertIn(True, [uname_m + " GNU/Linux" in line for line in st= dout]) =20 - self.run_common_commands() + self.run_common_commands(wordsize) self.shutdown_via_ssh() =20 def test_mips_malta32eb_kernel3_2_0(self): --=20 2.7.4