From nobody Wed Nov 12 16:27:12 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; dkim=fail; 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=1571498685; cv=none; d=zoho.com; s=zohoarc; b=llsBraIJw9Zlqr/62M6RYapfT1zhV16HSruG41hKQL1N8l314y8pPQyZG4wsYXUbojGmxuyeyYAcPRBIJfCiEki011JhiJ8JwZczdqd4z/Kr8jEhL9ExCdS+YGamdi2Dcn1vqUgiM2U7n7Dd/iD5HXMPY93x73dnie0ZDjkI6w0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571498685; 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=CMHbwukv5zQAWHD/pJCrE6K07x6qMk4wAjcROnJyKl4=; b=A37pQ/MdDmqo4GKhtTBCpcadQcz6QUOQ44iET7bYS+V7XB0TPdpIivj3XqX2ZFJsIc298AmCjoTmzuLzHKMG3gTcHz2MtTArhY75WFRCmKS4OVM3NGAXUmeCyEgKwEILTf0JfRYjNuvsMuPVn9LXITaWrC2xJbT9gflChD2CR08= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 1571498685367260.4194477591932; Sat, 19 Oct 2019 08:24:45 -0700 (PDT) Received: from localhost ([::1]:56666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqay-00066S-93 for importer@patchew.org; Sat, 19 Oct 2019 11:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45785) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqO2-0001Le-1y for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:11:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqNy-00079j-Vf for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:11:21 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:40041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqNy-000781-Ph for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:11:18 -0400 Received: by mail-wm1-x344.google.com with SMTP id b24so8705795wmj.5 for ; Sat, 19 Oct 2019 08:11:17 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id t13sm10753964wra.70.2019.10.19.08.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:11:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CMHbwukv5zQAWHD/pJCrE6K07x6qMk4wAjcROnJyKl4=; b=jEd3lqnZjZNfaLbSqhh/xZ+Adzq0FR8zU5pnXOlsoAZ0qwZ6J6xdiyx70UfMV5Eu5d e2EyV2nBHbNOODEFMXTFFMePTgIrgIA2/QpoTCKpFaQrAcsWvoiIkyOh5G6KpHCOH07T 8V7txCphje+pBgXbpjs5nxCRdLtLRuNevM0JEiYbblXa2WycJPjo3Kj+BxepQI8/BRhO TIOpFiwa03d2mMF/j1ej0cOT8HLlC/yPhYdtaBzy9ozQDnLe53q+PNCeMKDrMB6IpPm3 im1gOhX/Ldeo1MKpUwIMwwXZL5Tgi8ScMcUocPeyNCnclEeS+VGgWrkwY47rZ6oSMzZx zV9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CMHbwukv5zQAWHD/pJCrE6K07x6qMk4wAjcROnJyKl4=; b=cPcizymUnqUPsZyf/YNHt5CixsnLoJZ/aUc6l0AZsK9ok+5yzUjssZxRgsx3YROVdY kne5XclKrfCT/D4hU4Yg/ZH8Wo0eeh6+UCIot8LOrFB8hDEP7NP0oF6dtF86eYD2M0AD eKMw3P18Iw1arCxL95M4fT46efdFuLCGac8gLP4Qn1W5uyRiHGrA0Jb9yBmiQgUBCf1A Tzjfpf/BEr7ByS+u4bN4gECfqU86CUlxPkf1tyr7BMOnd33Sb9LCu9/r5DOytQYTvgHo EvTwppbViz8WJucoapoTgqNmbWaoqAFac5NhRap5m+6g7dpCgl1QsZ30Cf34ClrMH96m 4EYQ== X-Gm-Message-State: APjAAAWHFmlztsW610VCy/XPZO19vVP+nOK2xYqGWOu4Q7mUkTk1KCx7 xKS8bUImqU/6kUX2jYDlqDhmR8sY X-Google-Smtp-Source: APXvYqwwy8+KD+Jxhdw9k+A5Fm2luaAhvyJmgYeJFPVWAdVlkcH+SHK3zZRcRZSUEAkEvLo50G3x2w== X-Received: by 2002:a7b:c849:: with SMTP id c9mr12265293wml.58.1571497876661; Sat, 19 Oct 2019 08:11:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 11/11] tests/ssh_linux_malta: Fix 64-bit target tests Date: Sat, 19 Oct 2019 17:10:58 +0200 Message-Id: <20191019151058.31733-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019151058.31733-1-f4bug@amsat.org> References: <20191019151058.31733-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 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: Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 --- .mailmap | 1 + tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 0756a0bf66..fb7d7ede76 100644 --- a/.mailmap +++ b/.mailmap @@ -158,3 +158,4 @@ Zhengui Li Zhenwei Pi Zhenwei Pi Zhuang Yanying +Aleksandar Rikalo diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/li= nux_ssh_mips_malta.py index 2139c80f5f..fc13f9e4d4 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -44,8 +44,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''): @@ -143,16 +143,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') @@ -209,7 +209,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.21.0