From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FFBACA9EAB for ; Sat, 19 Oct 2019 15:53:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E32D721925 for ; Sat, 19 Oct 2019 15:53:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b3Q+/OFt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E32D721925 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57435 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLr2Y-0003mj-SI for qemu-devel@archiver.kernel.org; Sat, 19 Oct 2019 11:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48899) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLr08-0001Zp-4Y for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:50:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLr06-0003cL-Qi for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:50:44 -0400 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]:38371) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLr06-0003cF-LT for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:50:42 -0400 Received: by mail-oi1-x241.google.com with SMTP id d140so3399957oib.5 for ; Sat, 19 Oct 2019 08:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Vp0nySnYUjEDYRGvqDuCiKgcnjpgHeMd55ERJNAxMk0=; b=b3Q+/OFtizYbPTwc8zCm4mmSMmHpfPNioKGzfYuZpo3MebtU6ZfdcpB3qCJK6PmDF7 3wBsG/IAM0oxbT/iow8icPDOwS9teu9E6/CRaRUxCp6PutQEB7CK5NcBHoYnd4cWthsP GNQeyKEz/ExOvcZsiEQSpxZwuUN2l+Jn1ewGgiw7dx5MzpEeg31Se5pU4jqL0pQKeG8o LfL3HO7aOa3NhTrvAVYRfb5BuI0/F/zCHUqPTZD7eVSHyyN9xqas4sAgOyzJWQjEB1lv 48YMheTNkbS7XrAKMhTjxNLJ48v8A5tnNvne/iMTm4tPISvL0fVQ1e2mfKUz/EX/AP+z QRIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Vp0nySnYUjEDYRGvqDuCiKgcnjpgHeMd55ERJNAxMk0=; b=mq3GGu9Hhb6sy/WfLv6svl8T+9gR9gUzHghvFnveTF0ssVvMpO7nyM8qr970QbCN6N UXvAIfIj1cMVDTV+ydIosfPsOw/5wtCxlts3iyOhcqBa+m9K8LqDBLxysRwaGnYbhNiJ kRYkuj+w8I8uETzc3v6tso/vcxGGifaKeNn4a98Gr/pbAWGji8lfyqJTjrtXeFRVAhU0 HaGC2J+veL0UVSpMrTttqByBqQLuwIeUR7GVyHi7t30DjStj0F2sYxyf1FzGqhIthyjX gKqi5q4pn9wGwfgMn5Adty1ij2xMm/iabARnWHBNy9MknThSSy2dNlhdvJaBZA8CaxHq +uLA== X-Gm-Message-State: APjAAAWorLXSFVFLHmtU9agsXwdjzvpAa1HAdPiruLAWbIgQ+ZjursS8 YesYSQkCqECbT/IR2KIg8ZZ1vVgnC9mgabIM8YI= X-Google-Smtp-Source: APXvYqxtOFuI4Q010eJeOYvykqVFBliN7QxahjJ3YvSN2a4CSzirrF32x6P/Q0CxebVhhyR83BgcAhWqXSe2r0wfucw= X-Received: by 2002:aca:4d12:: with SMTP id a18mr11916627oib.79.1571500241908; Sat, 19 Oct 2019 08:50:41 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a9d:340a:0:0:0:0:0 with HTTP; Sat, 19 Oct 2019 08:50:41 -0700 (PDT) In-Reply-To: <20191019153437.9820-12-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> <20191019153437.9820-12-f4bug@amsat.org> From: Aleksandar Markovic Date: Sat, 19 Oct 2019 17:50:41 +0200 Message-ID: Subject: Re: [PATCH v2 11/11] tests/ssh_linux_malta: Fix 64-bit target tests To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: multipart/alternative; boundary="000000000000aef78305954569ad" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::241 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 , "qemu-devel@nongnu.org" , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000aef78305954569ad Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Saturday, October 19, 2019, Philippe Mathieu-Daud=C3=A9 wrote: > 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 > --- > v2: do not include Aleksandar Rikalo mailmap change > --- > tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > Reviewed-by: Aleksandar Markovic > diff --git a/tests/acceptance/linux_ssh_mips_malta.py > b/tests/acceptance/linux_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'} > } > > 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)) > > - 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 > stdout]) > > - self.run_common_commands() > + self.run_common_commands(wordsize) > self.shutdown_via_ssh() > > def test_mips_malta32eb_kernel3_2_0(self): > -- > 2.21.0 > > > --000000000000aef78305954569ad Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Saturday, October 19, 2019, Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org> wrote:
Commit 9090d3332cdcc added tests for specific to the 3= 2-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 <f4bug@amsat.org>
---
v2: do not include Aleksandar Rikalo mailmap change
---
=C2=A0tests/acceptance/linux_ssh_mips_malta.py | 12 ++++++------
=C2=A01 file changed, 6 insertions(+), 6 deletions(-)


Reviewed-by: Aleksandar Markovi= c <amarkovic@wavecomp.com>=
=C2=A0
diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptan= ce/linux_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):
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0CPU_INFO =3D {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 32: {'kernel_release': '3.2.0-4-4k= c-malta'},
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 64: {'kernel_release': '3.2.0-4-5k= c-malta'}
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 32: {'cpu': 'MIPS 24Kc', '= kernel_release': '3.2.0-4-4kc-malta'},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 64: {'cpu': 'MIPS 20Kc', '= kernel_release': '3.2.0-4-5kc-malta'}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0def get_url(self, endianess, path=3D''):
@@ -143,16 +143,16 @@ class LinuxSSH(Test):
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0else:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.fail('"%s&quo= t; output does not contain "%s"' % (cmd, exp))

-=C2=A0 =C2=A0 def run_common_commands(self):
+=C2=A0 =C2=A0 def run_common_commands(self, wordsize):
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.ssh_command_output_contains( =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'cat /proc/cpuinfo'= ,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '24Kc')
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 self.CPU_INFO[wordsize]['cpu= '])
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.ssh_command_output_contains( =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'uname -m',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'mips')
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.ssh_command_output_contains( =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'uname -r',
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '3.2.0-4-4kc-malta')
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 self.CPU_INFO[wordsize]['kernel_release'])
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.ssh_command_output_contains( =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'cat /proc/interrupts&#= 39;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'XT-PIC=C2=A0 timer'= ;)
@@ -209,7 +209,7 @@ class LinuxSSH(Test):
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0stdout, _ =3D self.ssh_command('uname= -a')
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.assertIn(True, [uname_m + " GNU= /Linux" in line for line in stdout])

-=C2=A0 =C2=A0 =C2=A0 =C2=A0 self.run_common_commands()
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 self.run_common_commands(wordsize)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.shutdown_via_ssh()

=C2=A0 =C2=A0 =C2=A0def test_mips_malta32eb_kernel3_2_0(self):
--
2.21.0


--000000000000aef78305954569ad--