From patchwork Sat Oct 19 15:34:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1179842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E3AX8Tbg"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 46wRwG4bfwz9sNw for ; Sun, 20 Oct 2019 02:41:50 +1100 (AEDT) Received: from localhost ([::1]:57006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqrT-0004Of-RZ for incoming@patchwork.ozlabs.org; Sat, 19 Oct 2019 11:41:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47497) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqkq-0005M2-4N for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqko-0002xI-PL for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:55 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55466) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqko-0002wq-JU for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:34:54 -0400 Received: by mail-wm1-x341.google.com with SMTP id a6so8967303wma.5 for ; Sat, 19 Oct 2019 08:34:54 -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=NgJtsZYXc8GUBV9Y62Y8rMxQDFlakDpMkIO4EX7Mgs8=; b=E3AX8TbgQiqEq8dUqYFtOi4V3lWDMUcO/q2fz2futfdy4m5C7+isj3Ent22hMojLZB 5dUSR3FtZ8/IjP9WGix6pZkihO0BTfs0KhemiyDW4H7UieztSPMcLTWQF57EOo5c7S90 9UgZos4CqbYY/FCevnQYU1MzEzaT+BVjvPv7M+zdN7jeziwVXqB1Hv5vWtSJ7KrXv6KG W6WuY7D/Dv1720LtXWIbxqpfLMSS7/KgXtLj2cSY5Ytv08KT4qZBca9begLOazZKqqqA IWHFW9E5+puByCfK1tvje4IE+OGF9HaTi0J0m/LeAZ9mHXbET5usREY3Tae8r4asvi2c n3pQ== 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=NgJtsZYXc8GUBV9Y62Y8rMxQDFlakDpMkIO4EX7Mgs8=; b=lmzZYiD55ujzATtECpktS16xO93KtdHTF49HZuJxm8uxEeHcqgjm39yN1RQbPLqixc ssSFBQX1dU2/qrJd4hOGBchLH70exjHAJlDurB5jnBHJ3hG5urhNOmLGXK7fXarRLNo3 2HYn4lPeheN/jcxJ/2JMMJju62YYhbIx3S58Scum+WEP681LX+6m+U5de/kQnG90xo+5 AhYwzNXut3uThh+Nu14ArL1IcFc5ypTxuyJf71xOLyf5ald4W+JUJbq2piAv5Tbd2PSX z0gCNx54X8nCCG/gKSsxOmcdgtgU7JBfE1W7PPizXQKW1jyIyQKHjNdFVGy+rEDIlRPJ Oi2Q== X-Gm-Message-State: APjAAAU7WJhRCBk4QcNeTXW2ez6ifjyOkjOvFImOHOs7X1wVth9LBXxS GS0lZR4CZmV+YQDyXxpTSLZsofhg X-Google-Smtp-Source: APXvYqxhKIErd2dXNAFmNjv+BevWeVg9xNanZEtdr3OiDr1BIzL6lL2gFfwAcdrm37y/mQ3sfVQVNw== X-Received: by 2002:a1c:5946:: with SMTP id n67mr12569936wmb.93.1571499293434; Sat, 19 Oct 2019 08:34:53 -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 j19sm15245605wre.0.2019.10.19.08.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:34:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/11] tests/ssh_linux_malta: Fix 64-bit target tests Date: Sat, 19 Oct 2019 17:34:37 +0200 Message-Id: <20191019153437.9820-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019153437.9820-1-f4bug@amsat.org> References: <20191019153437.9820-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é Reviewed-by: Aleksandar Markovic --- v2: do not include Aleksandar Rikalo mailmap change --- 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/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 = { - 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=''): @@ -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, _ = 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):