From nobody Sat May 18 10:07:55 2024 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=1571333847; cv=none; d=zoho.com; s=zohoarc; b=Sk1CIOsANQXhfcT2S1DLOT+4bmJ4H2Kt6RfASgoK9Kf9weWw2Q7+Zb2Nfi9dZbUvdBzjA+6wZ5RDNbS91K+FHHZBJGuD44pl8augTTimJlof5R+DqgBabHfREGdLZksVNobN6fJH1ohb05YOvs2zAURMZYZ+YFvRCY9bnHRj6D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571333847; 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=lRZXRUlp7wZ+Lo2v+5O7rUObPFoqCZggqml9lEdRP5k=; b=itiFU0ShxJ40gr1gv9Sit/HxuN2rmVPsmyffbcahodg3hfUmBqN3FmC327ZDn2BFxU/R/ze4zYVgYX6x339zx3OlJ1xTK/Que3PC2elzcIQWlgWcocYBNcVh9zlTT4jEkVcEKiXsiLzZ2T/aSJwK7RUqMuX14Y2Sg0crLyv0jSs= 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 157133384714226.61748558072111; Thu, 17 Oct 2019 10:37:27 -0700 (PDT) Received: from localhost ([::1]:54698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9iI-00027C-20 for importer@patchew.org; Thu, 17 Oct 2019 13:37:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91B-00017a-2U for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL919-0006aY-8t for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:52 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL919-0006a9-1i; Thu, 17 Oct 2019 12:52:51 -0400 Received: by mail-wr1-x42b.google.com with SMTP id r5so3143282wrm.12; Thu, 17 Oct 2019 09:52:50 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:48 -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=lRZXRUlp7wZ+Lo2v+5O7rUObPFoqCZggqml9lEdRP5k=; b=JoRjSHqtQSNd0fv/x2i+EbhPEnTJEA5zoBmxfXVXAXiaFHjS5C8wwaGT/TdW0Mbn40 uNpxNF+qy9lUg1zZkmcPobwUZ0pmYAtfyqTzhkzlFufo1wyxvCGD+f/Fgw2DRbvIAxpa G/d3u1aJkjfO2stL/RxbpvT4qrrCqP+9L/AoTkyg0y/IX26IAt2pXFB6NtLUM8Twxjt1 5zT1sUQLLGi/FZvsiSk5iEpLimpY7FMlP1uootZlDwUz1eFY5udAgbQ1JN3vGDjKOtYr GnxahV8tX9A+nhCOtnLN+Gig3UiFbxRkbxSI9BHUHoO0NpoaLu7jAImqWl9b3AdYZBNs 5EGQ== 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=lRZXRUlp7wZ+Lo2v+5O7rUObPFoqCZggqml9lEdRP5k=; b=PhPplVfSW8rFdwO/NscZWS3oLcmlDMCHnVa9bh/17Sf83kRb4YEiSTJ6urcqISMf4e h27RjPcC6jb0jfX6fu2o2EVlisFzkO0uZuOgGnN1OJjn+1xkB8rkVHjkJqUOjoPiZ/6h DzrP6j61Wr84dVMPkVQUmjbZgVgq3vKmjG+r50OMOtw3vZvwL/Vi3fJEgwb0Wwo9dJPK 7AshDsQv7pTT2RNx0O2mbWMzkSZ0zgrh5zdAImaQAtHkfod8HH6br85PAw5/bj5udgUq iXyBqjZFq7RDPeEQ08o1f0f58gzKn10rMDmNJg0JaEjn3eYVHlGCgqa0JKKNo5vTCjof Misg== X-Gm-Message-State: APjAAAWISyebzlDiRUdM05ZhPrNGuXWHRLijX4P9bAnbNzPjfQ/OIlZg PgKLafEGFODdBf/ZM81BX41F3Dejzms= X-Google-Smtp-Source: APXvYqyK75HOsZxzyqMMGrxmu+rlPdSuKPxW5C5AST652f8Xt+WlPw3xopfzzedXaWL8DSRQrIrjwg== X-Received: by 2002:a05:6000:1283:: with SMTP id f3mr3707402wrx.370.1571331169525; Thu, 17 Oct 2019 09:52:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/9] Acceptance tests: refactor wait_for_console_pattern Date: Thu, 17 Oct 2019 18:52:31 +0200 Message-Id: <20191017165239.30159-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::42b 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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Cleber Rosa The same utility method is already present in two different test files, so let's consolidate it into a single utility function. Signed-off-by: Cleber Rosa Message-Id: <20190916164011.7653-1-crosa@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: rebased fixing conflicts in linux_ssh_mips_malta.py] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Gibson --- tests/acceptance/avocado_qemu/__init__.py | 26 +++++++++++++ tests/acceptance/boot_linux_console.py | 47 +++++++---------------- tests/acceptance/linux_ssh_mips_malta.py | 18 ++------- 3 files changed, 42 insertions(+), 49 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index bd41e0443c..a0fe16e47f 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -8,6 +8,7 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 +import logging import os import sys import uuid @@ -53,6 +54,31 @@ def pick_default_qemu_bin(arch=3DNone): return qemu_bin_from_src_dir_path =20 =20 +def wait_for_console_pattern(test, success_message, + failure_message=3D'Kernel panic - not syncing= '): + """ + Waits for messages to appear on the console, while logging the content + + :param test: an Avocado test containing a VM that will have its console + read and probed for a success or failure message + :type test: :class:`avocado_qemu.Test` + :param success_message: if this message appears, test succeeds + :param failure_message: if this message appears, test fails + """ + console =3D test.vm.console_socket.makefile() + console_logger =3D logging.getLogger('console') + while True: + msg =3D console.readline().strip() + if not msg: + continue + console_logger.debug(msg) + if success_message in msg: + break + if failure_message in msg: + fail =3D 'Failure message found in console: %s' % failure_mess= age + test.fail(fail) + + class Test(avocado.Test): def setUp(self): self._vms =3D {} diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 8a9a314ab4..9ff2213874 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -9,12 +9,12 @@ # later. See the COPYING file in the top-level directory. =20 import os -import logging import lzma import gzip import shutil =20 from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive =20 @@ -29,31 +29,10 @@ class BootLinuxConsole(Test): =20 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 - def wait_for_console_pattern(self, success_message, - failure_message=3D'Kernel panic - not syn= cing'): - """ - Waits for messages to appear on the console, while logging the con= tent - - :param success_message: if this message appears, test succeeds - :param failure_message: if this message appears, test fails - """ - console =3D self.vm.console_socket.makefile() - console_logger =3D logging.getLogger('console') - while True: - msg =3D console.readline().strip() - if not msg: - continue - console_logger.debug(msg) - if success_message in msg: - break - if failure_message in msg: - fail =3D 'Failure message found in console: %s' % failure_= message - self.fail(fail) - def exec_command_and_wait_for_pattern(self, command, success_message): command +=3D '\n' self.vm.console_socket.sendall(command.encode()) - self.wait_for_console_pattern(success_message) + wait_for_console_pattern(self, success_message) =20 def extract_from_deb(self, deb, path): """ @@ -89,7 +68,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_mips_malta(self): """ @@ -112,7 +91,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_mips64el_malta(self): """ @@ -145,7 +124,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_mips_malta_cpio(self): """ @@ -181,7 +160,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line, '-no-reboot') self.vm.launch() - self.wait_for_console_pattern('Boot successful.') + wait_for_console_pattern(self, 'Boot successful.') =20 self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo', 'BogoMIPS') @@ -208,7 +187,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_mips_malta32el_nanomips_4k(self): """ @@ -266,7 +245,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_arm_virt(self): """ @@ -287,7 +266,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_arm_emcraft_sf2(self): """ @@ -314,7 +293,7 @@ class BootLinuxConsole(Test): '-drive', 'file=3D' + spi_path + ',if=3Dmtd,forma= t=3Draw', '-no-reboot') self.vm.launch() - self.wait_for_console_pattern('init started: BusyBox') + wait_for_console_pattern(self, 'init started: BusyBox') =20 def test_s390x_s390_ccw_virtio(self): """ @@ -335,7 +314,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_alpha_clipper(self): """ @@ -357,7 +336,7 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) =20 def test_ppc64_pseries(self): """ @@ -377,4 +356,4 @@ class BootLinuxConsole(Test): '-append', kernel_command_line) self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/li= nux_ssh_mips_malta.py index 25a1df5098..ffbb06f846 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -13,6 +13,7 @@ import time =20 from avocado import skipUnless from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive from avocado.utils import ssh @@ -40,19 +41,6 @@ class LinuxSSH(Test): def setUp(self): super(LinuxSSH, self).setUp() =20 - def wait_for_console_pattern(self, success_message, - failure_message=3D'Oops'): - console =3D self.vm.console_socket.makefile() - console_logger =3D logging.getLogger('console') - while True: - msg =3D console.readline() - console_logger.debug(msg.strip()) - if success_message in msg: - break - if failure_message in msg: - fail =3D 'Failure message found in console: %s' % failure_= message - self.fail(fail) - def get_portfwd(self): res =3D self.vm.command('human-monitor-command', command_line=3D'info usernet') @@ -109,7 +97,7 @@ class LinuxSSH(Test): =20 self.log.info('VM launched, waiting for sshd') console_pattern =3D 'Starting OpenBSD Secure Shell server: sshd' - self.wait_for_console_pattern(console_pattern) + wait_for_console_pattern(self, console_pattern, 'Oops') self.log.info('sshd ready') =20 self.ssh_connect('root', 'root') @@ -117,7 +105,7 @@ class LinuxSSH(Test): def shutdown_via_ssh(self): self.ssh_command('poweroff') self.ssh_disconnect_vm() - self.wait_for_console_pattern('Power down') + wait_for_console_pattern(self, 'Power down', 'Oops') =20 def ssh_command_output_contains(self, cmd, exp): stdout, _ =3D self.ssh_command(cmd) --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571333120; cv=none; d=zoho.com; s=zohoarc; b=SToA/ugil2ze80BCJdV212QDNSNPOPTLM6anbkSHyiBaIRtmuiYK/3IGfK5e1NIWk0nhLU5SNFQznfssWKRH7++EiBTyL9Nf2lsY10sI+mjLIVBfqIxLyoqOeUWw9Ic4PHmZe+XQ3Sw86PACb59sm2qbkh8ilWOMfW0P7sHkns8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571333120; 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=Fw8En6w1n23AXCLCPcsRW4J3X8Ym/DLL6U1eg1A662Y=; b=IWTFwabbOj48xWc0EDX9n91qTDdLdW88Rgc9qWqVehT76dHfHT8FEpMBRuiDNxUnREygmNae/wtZicRVH/eABCrSd4npxtG42Y7ZR6GQr7KUbmk83xBcAz6XqPdJZmUBfN6OKkc3q4ji+nV5M9YWE4bX3j8V3lLg7aLHdnpP4/s= 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 1571333120564733.7416206181648; Thu, 17 Oct 2019 10:25:20 -0700 (PDT) Received: from localhost ([::1]:54300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9WZ-0004xt-0A for importer@patchew.org; Thu, 17 Oct 2019 13:25:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42567) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91B-00018S-KK for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91A-0006ay-Jn for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:53 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91A-0006ag-E0; Thu, 17 Oct 2019 12:52:52 -0400 Received: by mail-wm1-x341.google.com with SMTP id r19so3298738wmh.2; Thu, 17 Oct 2019 09:52:52 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:50 -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=Fw8En6w1n23AXCLCPcsRW4J3X8Ym/DLL6U1eg1A662Y=; b=i1djodDcuYTdG28urBgXgCbYwElAubJwRUaf83f9I5LhoP0Xy9vYJ4IpFcbh48dAfr FcIK8AVS05/+eNalZFOBYXK8HGJA0zsCL7g+pLsr11iIIAaiS2xtFeXf/JP5yhUgRCrj 24aBglX5gF1TSWiZNflg3rWP4n+EOTd+AJQ+UKl+5A2cXAO5K2wFt7bupK+nlKfU1sDu jc5Y+H1ODTSbNhXDCROWdQ8kxFIgjVUNrfRrl2IdW3OfobKm4vVNR+4Fqnt5eEwFnOR/ HIxRMVbaoNvOEEnRLGpG6489WyqMduIWIHaSmLElqKvLxATV3Utx+Ii5i3RaxOTxjSmM 8LDw== 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=Fw8En6w1n23AXCLCPcsRW4J3X8Ym/DLL6U1eg1A662Y=; b=hORUhw06pqozwXCxXJ9hGUIETUte0v3hSy1MK7maD4m53eOc2k/yBRCw7fYtaPStQB QgxrR9aFnXMXTazBMvSnPn87JlKcETizC/wzOh2WDlTqjXGcbKIMDRoEFBXuX5f6FsPH dWFItwvtray0P0CNNsG287e3XHC+y3f7wB1yZSMsah9+UJljR0ukKh5VWY0pMTnYo24w 5U6jsZN0ExHY5ny99zstq6CPNMPufWi7ocx6zvfZDAoxotU3529Rtx93QEC9p7o9rZeV KZoYZSEwKmy1uucbHvC2SMH348Uxal8Kzp9rA4xeEFAB6bjKGUQF6m3dQh6vv4nAZi0E pkqQ== X-Gm-Message-State: APjAAAVKgj2qDHkrfz6FPeiVNWeAcwIWHK0ZbVertRX+l8KxnblvADjF SzpfGHigdVUhdzXxyifq0T6v1IfRHDg= X-Google-Smtp-Source: APXvYqxAUt6M0DTBolt+Uie0MwJXpaR+X8GTIikvt7JZU/w0Ypc9aa7hYAJYuqtBq+ZZ4hf6TkL12w== X-Received: by 2002:a7b:c930:: with SMTP id h16mr3690875wml.163.1571331171138; Thu, 17 Oct 2019 09:52:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v3 2/9] tests/acceptance: Fix wait_for_console_pattern() hangs Date: Thu, 17 Oct 2019 18:52:32 +0200 Message-Id: <20191017165239.30159-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Because of a possible deadlock (QEMU waiting for the socket to become writable) let's close the console socket as soon as we stop to use it. Suggested-by: Cleber Rosa Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/avocado_qemu/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index a0fe16e47f..39f72945cd 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -75,6 +75,7 @@ def wait_for_console_pattern(test, success_message, if success_message in msg: break if failure_message in msg: + console.close() fail =3D 'Failure message found in console: %s' % failure_mess= age test.fail(fail) =20 --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571334076; cv=none; d=zoho.com; s=zohoarc; b=Fji3sUOumZHqr1nSN6yIJ8seO6U1wdQWLQkX/SjPdzMrq1XxcEz0WXK+fahfZgoC7rApeHH9PxRsWG8DVXoqMTFAUUCc+bRwlssoZO/cfv5wU/Zh/0cAaQR2ZtEOj+7GR6H/bjh/MGudVBceRQg14n/PqOHFOOjlikOFJqVQAsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571334076; 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=0xXz6e28KynrM5DlHHkebUU7iiubU1U+3QXcLu3E9vs=; b=DLeE7mT+GH8TLAmGRLfxAtGXKvXjiCo1/j+lsUBaYP8yfDrkaOLHZR7gkTMRU8Y9hI0IBlbobAYrHpxpq9wvQkj7ijbIKFYfPDBmXv68V2ioBamfjdka7foPREH1mIc974nrVI8YPo0dfSuZKWUC4r9r0kkrk/7AN7xh9MttQWg= 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 1571334076826697.0261138075776; Thu, 17 Oct 2019 10:41:16 -0700 (PDT) Received: from localhost ([::1]:54786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9lx-0006Nl-Ot for importer@patchew.org; Thu, 17 Oct 2019 13:41:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42591) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91D-0001B9-DV for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91C-0006cw-6b for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:55 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91C-0006cG-0b; Thu, 17 Oct 2019 12:52:54 -0400 Received: by mail-wm1-x334.google.com with SMTP id 7so3312311wme.1; Thu, 17 Oct 2019 09:52:53 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:52 -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=0xXz6e28KynrM5DlHHkebUU7iiubU1U+3QXcLu3E9vs=; b=f+/SwNG/8nc6itrdhLCuM6LdD5K2asTG2kL6A4MasN5yN89ds6wR/+e1zZ1Hwe0aR0 F2Cf/FLfxTLLA8s83UWKMJyFmyAvyW/ozAS74xTM4yoy2H/MxmKKekstS3MDbqMKSBs+ UO7oO8PmLUbbojKS51vVymISVRhR1wHfBJwCG/JffbdtGz3hMAJJOsaWzYtFKu2lLsN/ DxcwXtyv8IWzXdCtR1+YIrrI66rUIRaNgHxyBqR5tdTC6CCev8CIZGzT/UnzLomhBHTR xzkMTR7f7fXZq0YrVdafe5pKB5ML46zZWsv739PitDOX5jEh559efh3Y99fOXtG8Zr97 J4iA== 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=0xXz6e28KynrM5DlHHkebUU7iiubU1U+3QXcLu3E9vs=; b=KgP2PragMZWZ1VsSwUam5FIiKWp2Y8/CzpzJuoaSAvLztAcNu4qxCxfJSenn98milC 22SYyatvPlZxsr6tLVG5qLSA3ZJ4cQzblo4iQIdhEZqWS8n6/wS+9VbjRnnwvravpawj 2IRiWL+QKOeJKus38kyqGsLLu+mlzGDXySwqLMwHORzYvsZ1E2vH8xHMiPy6SbFtxDgB F04jD2VgjIf2aZUXIohFnbC8t1qw1wL2ICSjaXRgcNH+DZmy8YHlBbRR0D7qHTEPHZBa UjTQojCWqws2l/YwhrTUy4MMJLcL3utvCx1FWgA5qOhCdGmP3LiCFn/rIVvtUqy6IHcV sUQg== X-Gm-Message-State: APjAAAUbRUwtpPKLJ4IZVpwcwmygdS2qhQyTir0UVAvii5v0NwXhl6wh IgBTrlmLyzWE3mjsWCGlaGU7pVNZEaI= X-Google-Smtp-Source: APXvYqwqOZM6lue9w1nkdk6NJF8tgoqZhXEvoD/iO3k+D/sQSL8KIELQkJn7r4HK6VHhxNexPp26wA== X-Received: by 2002:a1c:f305:: with SMTP id q5mr3715068wmq.137.1571331172815; Thu, 17 Oct 2019 09:52:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 3/9] tests/acceptance: Send on serial lines Date: Thu, 17 Oct 2019 18:52:33 +0200 Message-Id: <20191017165239.30159-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::334 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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some firmwares don't parse the control character and expect a . Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/boot_linux_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 9ff2213874..bf9861296a 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -30,7 +30,7 @@ class BootLinuxConsole(Test): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 def exec_command_and_wait_for_pattern(self, command, success_message): - command +=3D '\n' + command +=3D '\r\n' self.vm.console_socket.sendall(command.encode()) wait_for_console_pattern(self, success_message) =20 --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571333323; cv=none; d=zoho.com; s=zohoarc; b=f870Fp2bNtR1Tcyk+r2YFb7D+MfeALjONl6su2Q9/OzoGdTn7XzzRflCXm8T6vZ9x33byZyQw2sR1lTTVZWlNt8ix5BpOgQRqnqB2dmVc3Dcdm41X7mU0Bm3zBJokgFeErxQLVqXyetcR7h5foZcCpn76aRAkoOWXe9k0SmzmqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571333323; 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=OkDO1VIo+NhoE89bty8RovMaMRgboGY/bTEV8ryUKfQ=; b=Xq0iWvV1xdwMkiKhqRTytuzCZE2hjUvZIO6HGqqMkUhA6b/0QRimzLJS/6aCM5P2j11lokRQAlRdEKf3m0CRrEnjfiERy72meHgx5Wc02auokFDgisizXWAf2EAZMSRz8thxTcKpD0zYadHzYC2m5Iyyy0IzImus29Uf0wmfdaU= 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 1571333323404488.06399634544357; Thu, 17 Oct 2019 10:28:43 -0700 (PDT) Received: from localhost ([::1]:54366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9Zq-0000GI-4G for importer@patchew.org; Thu, 17 Oct 2019 13:28:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42618) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91F-0001Dv-14 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91D-0006dT-Rz for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:52:56 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:37053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91D-0006dF-Ly; Thu, 17 Oct 2019 12:52:55 -0400 Received: by mail-wr1-x441.google.com with SMTP id p14so3179498wro.4; Thu, 17 Oct 2019 09:52:55 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:53 -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=OkDO1VIo+NhoE89bty8RovMaMRgboGY/bTEV8ryUKfQ=; b=QTi6my3ki+JBZBovHcw7Vn13vrwE1556oa6dcixHUpB2dqdY8dVZQweEzDzqvAIXSB 2hiiM7UB5vWmURwWOfbUPKNcoxq9mwqECpUH3diLSRLETELH1hf3uL9ejy5zcb9Hx7B3 ac69AqNq4CkEwuqCeBiRJSXgRj1+x0R7bAXdblS0D+0KyEIpqCVUjT8W0deSsl3AQIKp neCQNpjOjDGAD0tEgviqX+OYeXPlvQludFhaMF+kDeftaiZHpq/sSJsOeyxnSMb1nbHT VFtBQJZFwx/RRkzYXoDO+XGKIgBJcvLubTMdgs+x7xSO+8/6jOEcn3cfIjHtG6GEEuKt C8qA== 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=OkDO1VIo+NhoE89bty8RovMaMRgboGY/bTEV8ryUKfQ=; b=qFSRatyo+Mpym1sAXHrRCFDKwvLjxgjRHOUy/ylnjYy5HeeoGEQLSI9aO4vD9a7Ys2 GD2G8j37fMbHFv22mUPgIVWdTfh4aUv04XgBe6IcajEb46GFTu3BzJty5nMODrglLbyN bRRRhNn7+cqnGMsDyhi3TCB9XodBM+aK9JkFbXXrE/4/51bB8hJLh96otexIUrvLLBpn 8opiJlNgwxQo1oE/LnYVs/JipdGl6SQIfXekwPrS8hJTZ3CPW7blVxRoSuxbGnVp/7Qc e53OUnylPVjawM1cw4TQIGAXLtlFR/RzHq6Y2txOUcG9/vdfNU1sLhCXo04Bb2ZOirTN aAHQ== X-Gm-Message-State: APjAAAXeB5MbhPy7Jk2fOnwKnBEW3H2qe4qkGqnCKdB2PYIjl+s4sXii wVi6hEZnGNQ7KbCpEVQkCpkS9SYFwUM= X-Google-Smtp-Source: APXvYqy6JjWwyZeMYa52ZZuvrWR9XNseuTfd6oKcMnMo94utkrpiPbj2J1LDfQeDrkcza67Pgxxgkw== X-Received: by 2002:adf:f010:: with SMTP id j16mr3990190wro.317.1571331174423; Thu, 17 Oct 2019 09:52:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 4/9] tests/acceptance: Refactor exec_command_and_wait_for_pattern() Date: Thu, 17 Oct 2019 18:52:34 +0200 Message-Id: <20191017165239.30159-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::441 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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The same utility method is already present in two different test files, so let's consolidate it into a single utility function. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/avocado_qemu/__init__.py | 19 +++++++++++++++++++ tests/acceptance/boot_linux_console.py | 12 ++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 39f72945cd..4d7d6b640a 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -80,6 +80,25 @@ def wait_for_console_pattern(test, success_message, test.fail(fail) =20 =20 +def exec_command_and_wait_for_pattern(test, command, + success_message, failure_message): + """ + Send a command to a console (appending CRLF characters), then wait + for success_message to appear on the console, while logging the. + content. Mark the test as failed if failure_message is found instead. + + :param test: an Avocado test containing a VM that will have its console + read and probed for a success or failure message + :type test: :class:`avocado_qemu.Test` + :param command: the command to send + :param success_message: if this message appears, test succeeds + :param failure_message: if this message appears, test fails + """ + command +=3D '\r\n' + self.vm.console_socket.sendall(command.encode()) + wait_for_console_pattern(self, success_message) + + class Test(avocado.Test): def setUp(self): self._vms =3D {} diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index bf9861296a..cc4d9be625 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -14,6 +14,7 @@ import gzip import shutil =20 from avocado_qemu import Test +from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive @@ -29,11 +30,6 @@ class BootLinuxConsole(Test): =20 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 - def exec_command_and_wait_for_pattern(self, command, success_message): - command +=3D '\r\n' - self.vm.console_socket.sendall(command.encode()) - wait_for_console_pattern(self, success_message) - def extract_from_deb(self, deb, path): """ Extracts a file from a deb package into the test workdir @@ -162,11 +158,11 @@ class BootLinuxConsole(Test): self.vm.launch() wait_for_console_pattern(self, 'Boot successful.') =20 - self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo', + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', 'BogoMIPS') - self.exec_command_and_wait_for_pattern('uname -a', + exec_command_and_wait_for_pattern(self, 'uname -a', 'Debian') - self.exec_command_and_wait_for_pattern('reboot', + exec_command_and_wait_for_pattern(self, 'reboot', 'reboot: Restarting system') =20 def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571334193; cv=none; d=zoho.com; s=zohoarc; b=EDNt6KD6VR4TE9chHLBGJ+5hoqTYxF6YWbreQ5+1nGip4+3UfQ1xxJnVcb3Zr27XjheGJGROZClgIP/qMJYUsh9m812iJf/iF7CoGBI7sMSMGSV6ABtYVpEJrPpvQxbyMGugTEdx2vY1ZNecjJ66teQ+tk2N1ZJaqTxHVGD4jAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571334193; 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=h/AjXKthzEaJ9ywjgYGWUdG8iYtl0YGTmNhIboeeBpw=; b=ZIQLIDN3+AMAyhisK50vOTuHhW5d2JEUqKmZAEDI76g7xuiVdJta1V6SZVLdxquYPmVO4xA/dfbnsi1bj5I2+cqm9nGXIuRwuks7TK37+nLMaJIT1wGLV23L/Y5c7GFPboEG2oZeHPkLfz1fpiXGKNSRD3fETGx9vtui2tn8co0= 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 157133419388584.99729212507975; Thu, 17 Oct 2019 10:43:13 -0700 (PDT) Received: from localhost ([::1]:54826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9nq-0008NT-IP for importer@patchew.org; Thu, 17 Oct 2019 13:43:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91I-0001It-5a for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91G-0006eP-OR for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:00 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:35986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91G-0006dr-I0; Thu, 17 Oct 2019 12:52:58 -0400 Received: by mail-wm1-x341.google.com with SMTP id m18so3295253wmc.1; Thu, 17 Oct 2019 09:52:57 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:55 -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=h/AjXKthzEaJ9ywjgYGWUdG8iYtl0YGTmNhIboeeBpw=; b=ADQ8sDvFKNbN/I/LJnaIJriI3HDEYuCOfnjjdpxqHp6CZtAy5Ej5n25CyScA7KYSS5 p607MhVsWsdVtA3FMU1lZ6XiOMN+Y+ytJgJ7wOdP+Zv37XkyCz/RXT7+ZQfpOJCakyBV yBvIFTrVyR5YScRks5HGpD5oI4H14P2pspV9lGK7+JW04V00LPO2c28truKQ0a+rljSC ZElvmT0X/8pvs5e2gs0igMM/zWHHLDs2LTWDBqBSj8fSTKvmPX8VNYtuYniqP1GDjtT2 9eVlvptNV87mUSPJVIyyczSQ3FIP7lssJG0A3xQM59z0XH0tOs0gHx4S78bDZQbIgFKR tJUg== 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=h/AjXKthzEaJ9ywjgYGWUdG8iYtl0YGTmNhIboeeBpw=; b=BIyUSa5j6KDdhqrlNE0f7b+HpDnvGclLkWCz0J7YZYNdNVMAlNz8tlFRafqicOUSOo atEu5p3Grkfc+Xu4zsnucxq+HwxI0xUPoheaTmCS7eP3XrGH7SyXdhUgYMk3UrpGGalf k4MwF8WxyK6sSeZUz8aU+1qY48NUaWqCk8LOU1DpS6CyhLbH9XpQQHb86ngg5tGnnH46 ukdLriPt8T0ZhOVo2Cl4c5QV9imxmO70VReDyYuQBF8tw/FlICOKS5jrbMJzm2kb4dh2 LqSHQ6NIiLULirlya+uw8AkMps8jpBlW/zkoD5Igw9YBwv74CJ5GMXaGavMT3JbTS6Nf kLEg== X-Gm-Message-State: APjAAAUVWjJOOTBsQHssqSi6BFy7WwA3jtIakAbL2LK0ihTNRl/eXlN5 B5I99QlsicWyJdAPIAGhdosnMN8M5/I= X-Google-Smtp-Source: APXvYqxrpBbOeApsMl8jwqgvIP76x92LdKIvMs31i+QTWrhxFz+zCuTK/mAc+Sej6Vu/ayiIiRx9oA== X-Received: by 2002:a7b:cc07:: with SMTP id f7mr3588313wmh.56.1571331176086; Thu, 17 Oct 2019 09:52:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 5/9] tests/acceptance: Add test that runs NetBSD 4.0 installer on PRep/40p Date: Thu, 17 Oct 2019 18:52:35 +0200 Message-Id: <20191017165239.30159-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As of this commit, NetBSD 4.0 is very old. However it is enough to test the PRep/40p machine. User case from: http://mail-index.netbsd.org/port-prep/2017/04/11/msg000112.html Reviewed-by: Herv=C3=A9 Poussineau Acked-by: David Gibson Acked-by: Artyom Tarasenko Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Installers after 4.0 doesn't work anymore, not sure if this is a problem from the QEMU model or from NetBSD. v3: use avocado_qemu.wait_for_console_pattern (Cleber) --- MAINTAINERS | 1 + tests/acceptance/ppc_prep_40p.py | 43 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 tests/acceptance/ppc_prep_40p.py diff --git a/MAINTAINERS b/MAINTAINERS index fe4dc51b08..83ec5cbf42 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1068,6 +1068,7 @@ F: hw/timer/m48t59-isa.c F: include/hw/isa/pc87312.h F: include/hw/timer/m48t59.h F: pc-bios/ppc_rom.bin +F: tests/acceptance/machine_ppc_prep_40p.py =20 sPAPR M: David Gibson diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_4= 0p.py new file mode 100644 index 0000000000..2978416b02 --- /dev/null +++ b/tests/acceptance/ppc_prep_40p.py @@ -0,0 +1,43 @@ +# Functional test that boots a PReP/40p machine and checks its serial cons= ole. +# +# Copyright (c) Philippe Mathieu-Daud=C3=A9 +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import os +import logging + +from avocado import skipIf +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern + + +class IbmPrep40pMachine(Test): + + timeout =3D 60 + + @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') + def test_factory_firmware_and_netbsd(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:40p + :avocado: tags=3Dslowness:high + """ + bios_url =3D ('ftp://ftp.boulder.ibm.com/rs6000/firmware/' + '7020-40p/P12H0456.IMG') + bios_hash =3D '1775face4e6dc27f3a6ed955ef6eb331bf817f03' + bios_path =3D self.fetch_asset(bios_url, asset_hash=3Dbios_hash) + drive_url =3D ('https://ftp.netbsd.org/pub/NetBSD/NetBSD-archive/' + 'NetBSD-4.0/prep/installation/floppy/generic_com0.fs') + drive_hash =3D 'dbcfc09912e71bd5f0d82c7c1ee43082fb596ceb' + drive_path =3D self.fetch_asset(drive_url, asset_hash=3Ddrive_hash) + + self.vm.set_machine('40p') + self.vm.set_console() + self.vm.add_args('-bios', bios_path, + '-fda', drive_path) + self.vm.launch() + os_banner =3D 'NetBSD 4.0 (GENERIC) #0: Sun Dec 16 00:49:40 PST 20= 07' + wait_for_console_pattern(self, os_banner) + wait_for_console_pattern(self, 'Model: IBM PPS Model 6015') --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571333945; cv=none; d=zoho.com; s=zohoarc; b=BtfYHJu8T79XuFKKU7XAtF7b6jWObQy+TAN2kfRDgLGY9Mo0BFXi0R/u17XZModlttbL3GMbYKEkV/HUq1s4qI+0PYFm3ST1wJ17Zkh5LO13havw5OlYSE3/R+680r6nGpNM3Gz2Isp1PlXmc08l/ZfL3EgO4L/kfpjv+SS4zD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571333945; 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=0CG2FzQa4cGE4e9qhNAZwZAlRFWE+HE6jkMUue3YYdc=; b=UhQFIFeFbK6r1ddBiiOLlZibqWmUtwvnE+FWvv8c9ve45y4OnTe1iGemCU8RWKuAilsLR5JXV3NZPhT4bPcKlx7cMarFnT7A1C3cU5YN+7LiQWdkXu3I4eLoBFhnVZW3DSeRakJ8TRo9pT/4AzT7Lucqbn9onJr0EwVwGG1hc1c= 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 1571333945119827.4539419863876; Thu, 17 Oct 2019 10:39:05 -0700 (PDT) Received: from localhost ([::1]:54730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9js-00049W-3x for importer@patchew.org; Thu, 17 Oct 2019 13:39:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42659) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91I-0001JU-HC for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91H-0006eW-AQ for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:00 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91H-0006eJ-4O; Thu, 17 Oct 2019 12:52:59 -0400 Received: by mail-wr1-x444.google.com with SMTP id o15so2742305wru.5; Thu, 17 Oct 2019 09:52:59 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:57 -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=0CG2FzQa4cGE4e9qhNAZwZAlRFWE+HE6jkMUue3YYdc=; b=fvvG2D+1VddywUfDPUSOVDKV7H4AXZDbY28I64NyJGYrr5+xHUTpnNdW+GnVJqumsx dG6OWnokpH6X6nOsPf+z8OTUdY31bBrMI0aIwPkOMmjeqUpsgk2dpP8QuQ9ZknJf2F4A zopeiCuwillomMywK2EQJC8Q/NZ1OID+0oJoAU4/J73TnsTAS+m48hIiskejfVqejO6I 77UV8YQfU2jvSlraFSzKyJt+jDAcESfR/MhgAW5sT5hDXT0zgpwSbCEmwoGRtJVzjR/l TpCaHxBZJntmWd9fg0vm05aI55dQzeIX5UxHZarvbKhiRCvZNjug9uhPlvklrwMi0xLE iHjQ== 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=0CG2FzQa4cGE4e9qhNAZwZAlRFWE+HE6jkMUue3YYdc=; b=ngpCNii53Xu5qIZyN1JaizUSUYM6yd0dAQwNargu6q4KZxbblo2NvpmmQ9TS5dT8JN syIIC9P4ojGbwnto75Whd/kPxRrqNi+64KP/JZgiwf828T1qJC2KU0Zc4boXyjpCuos9 0wTD7lO8RiWHl4Iae0SLge472NSVwcfYslURF07MUFz4Nt+NczCWzxjniwC2PhYaGm0+ /DxZAcI42AY7nF2fVRUK9er1I+YEpnJ7UxBAMhOQFKyWu2byfNeESolkKmGoaWwTYX5L UgnuE9yPv7zm+SvNgYbyrZjiSoKlwbz5JkeJIECSb2wX3pJcmbUOOjgfWeyXOSCWK7gZ 94Qw== X-Gm-Message-State: APjAAAUunBSBlblwvCAzuIBbYqUBRl1vstbNbsgvYnfgvV7+eJLUqtZx NK8EC2w0az6eqMbe4mvqNr1Ugyw2/Wg= X-Google-Smtp-Source: APXvYqwP0vqdsDFcN7nTROxIvCv2Gdqje/P2b3/oJlRLQF4R7mut5/fYPJts7B4SXojxh9EbAW4ypw== X-Received: by 2002:a05:6000:149:: with SMTP id r9mr141670wrx.90.1571331177797; Thu, 17 Oct 2019 09:52:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 6/9] tests/acceptance: Test Open Firmware on the PReP/40p Date: Thu, 17 Oct 2019 18:52:36 +0200 Message-Id: <20191017165239.30159-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::444 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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) User case from: https://tyom.blogspot.com/2019/04/aixprep-under-qemu-how-to.html Acked-by: David Gibson Acked-by: Artyom Tarasenko Tested-by: Cleber Rosa Reviewed-by: Cleber Rosa Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: use avocado_qemu.wait_for_console_pattern (Cleber) --- tests/acceptance/ppc_prep_40p.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_4= 0p.py index 2978416b02..7b8d0e55a9 100644 --- a/tests/acceptance/ppc_prep_40p.py +++ b/tests/acceptance/ppc_prep_40p.py @@ -41,3 +41,24 @@ class IbmPrep40pMachine(Test): os_banner =3D 'NetBSD 4.0 (GENERIC) #0: Sun Dec 16 00:49:40 PST 20= 07' wait_for_console_pattern(self, os_banner) wait_for_console_pattern(self, 'Model: IBM PPS Model 6015') + + def test_openfirmware(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:40p + """ + bios_url =3D ('https://github.com/artyom-tarasenko/openfirmware/' + 'releases/download/40p-20190413/q40pofw-serial.rom') + bios_hash =3D '880c80172ea5b2247c0ac2a8bf36bbe385192c72' + bios_path =3D self.fetch_asset(bios_url, asset_hash=3Dbios_hash) + + self.vm.set_machine('40p') + self.vm.set_console() + self.vm.add_args('-bios', bios_path) + + self.vm.launch() + wait_for_console_pattern(self, 'QEMU PReP/40p') + fw_banner =3D 'Open Firmware, built April 13, 2019 09:29:23' + wait_for_console_pattern(self, fw_banner) + prompt_msg =3D 'Type any key to interrupt automatic startup' + wait_for_console_pattern(self, prompt_msg) --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571334060; cv=none; d=zoho.com; s=zohoarc; b=Zrr0tK78z4VnMhS2O2koSp0BKwsj5Qm6Rm5/pyrLtlaF7lQA8wTFP6WE8nRJ76zKk6F/rwa9OU28GZ5GRxyKoa6whryJ9OsKSSCEiEHHzxiuo5YPUyrCBO4BcHXedqFOkLkXNijFMyoh5g+wC9PKislyuj3hqC0XRxmHWZhyhO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571334060; 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=W3lDbtSLeZg4TWsSDmT9Hq865HvTVpc0V+8V7NXclu8=; b=j8E9Hgz/CIs4FhS4iMKPX08tX15hJeTxitqosKI502XUd4GY/JJwPmmX6cBXhoe+LsGpav/QG9vmCiLRVH/hWJz/EOPIRL5bVo51P/YiLsPU5IvKTZf6AINWmNG4Zoxesdx4R1y3MR1bO/UtrtWB6fAV/HVl4cgZJ0pnrzwLl6g= 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 1571334060426594.8475462532595; Thu, 17 Oct 2019 10:41:00 -0700 (PDT) Received: from localhost ([::1]:54782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9lj-00062k-6M for importer@patchew.org; Thu, 17 Oct 2019 13:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42677) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91K-0001MX-87 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91I-0006fK-VN for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:02 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44911) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91I-0006ex-PT; Thu, 17 Oct 2019 12:53:00 -0400 Received: by mail-wr1-x441.google.com with SMTP id z9so3150437wrl.11; Thu, 17 Oct 2019 09:53:00 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:58 -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=W3lDbtSLeZg4TWsSDmT9Hq865HvTVpc0V+8V7NXclu8=; b=OUwtdt6j7N5beDeBxn3dccdXtqfseu8bSnVJeEmqiXZVeSi3weIas7Wy3fsHyv69W7 3Z3gc3odMDkgRTmsVgx45P0HXeH2PR0NDh0BdHEbmjPTOCajM5/1J3L+qwKCdzgANy2A JEe30xShhXbagJqq9AKJRyunVypDzYYjnQasqARhZucPis3oMggzYAZoE+gLOcFbcvDc OQo3EqfepzUPYEa687XGmwH5T8Sv0Y4dnLe6q/N9+xKtOAFJY+cK1Xg0dDFLtAWoiYbW WAVSOXi3wi4pZIAdarxDgbPyibm9Oq7x66qtQQAUQnOt5cff058oR6rR8Sv0vXSdFCF8 qkhw== 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=W3lDbtSLeZg4TWsSDmT9Hq865HvTVpc0V+8V7NXclu8=; b=dFp2f82+qrdB+eFfrFYfGeSPupuqzz/FJsECeH3YZyUE+XWbKumuTpGdIDfTpDxVIn 3ALCINJtgLz2ktxmtNoKZgE72Kj3m0Ya7HWlbdSHqxnm7XXoYSmwi4XfTU+poFlCYhMv 5ffnfaJ+dTw86MX8iYVEu/0tahWRA3ajCauaMqcrg08F9MS5hdT5Yo2TDI98HvaM507h 7jeiftCeWQRZlBhJHTAXWEXkEr4IK0di7abxXqhQL5FNTRn25jFQGsLJoPrl+mAUWhRQ khCJ5YcOouJ7mO7qY1QWzTyMsWrSy2bZByJZP8dhSaBAwRR4QycEu5OiSjTplOdzBGKa rtdw== X-Gm-Message-State: APjAAAVnTyaWKuHG63rj/o6oi7uthuzcYZ2KbNzbrDjP2USecLAJxwHi J7DY2vHgFGjEAz48GG+euZHrHcjWFrc= X-Google-Smtp-Source: APXvYqw9LGShEM8pAGmIsW1ahlKrMkjI1Tv9QpM4UtZVNngiTjqcSM14rJ8b2SO2PFIavsu6r1ALSw== X-Received: by 2002:a5d:44c6:: with SMTP id z6mr3806851wrr.313.1571331179651; Thu, 17 Oct 2019 09:52:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 7/9] tests/acceptance: Test OpenBIOS on the PReP/40p Date: Thu, 17 Oct 2019 18:52:37 +0200 Message-Id: <20191017165239.30159-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::441 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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) User case from: https://mail.coreboot.org/pipermail/openbios/2018-May/010360.html Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: - use avocado_qemu.wait_for_console_pattern (Cleber) - use MD5 hash --- tests/acceptance/ppc_prep_40p.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_4= 0p.py index 7b8d0e55a9..0ebedd16c8 100644 --- a/tests/acceptance/ppc_prep_40p.py +++ b/tests/acceptance/ppc_prep_40p.py @@ -62,3 +62,35 @@ class IbmPrep40pMachine(Test): wait_for_console_pattern(self, fw_banner) prompt_msg =3D 'Type any key to interrupt automatic startup' wait_for_console_pattern(self, prompt_msg) + + def test_openbios_192m(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:40p + """ + self.vm.set_machine('40p') + self.vm.set_console() + self.vm.add_args('-m', '192') # test fw_cfg + + self.vm.launch() + wait_for_console_pattern(self, '>> OpenBIOS') + wait_for_console_pattern(self, '>> Memory: 192M') + wait_for_console_pattern(self, '>> CPU type PowerPC,604') + + def test_openbios_and_netbsd(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:40p + """ + drive_url =3D ('https://ftp.netbsd.org/pub/NetBSD/iso/7.1.2/' + 'NetBSD-7.1.2-prep.iso') + drive_hash =3D 'ac6fa2707d888b36d6fa64de6e7fe48e' + drive_path =3D self.fetch_asset(drive_url, asset_hash=3Ddrive_hash, + algorithm=3D'md5') + self.vm.set_machine('40p') + self.vm.set_console() + self.vm.add_args('-cdrom', drive_path, + '-boot', 'd') + + self.vm.launch() + wait_for_console_pattern(self, 'NetBSD/prep BOOT, Revision 1.9') --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571333586; cv=none; d=zoho.com; s=zohoarc; b=MxtfhLYjnV7XRpwcHwTlmdWAW1Wyj8W7EAL0BfghyRx2iLqGJQOSFYTHu7pcHW0oAN4z0Q6axmi7dj2YqoGzN0w2mowPc8cheQt8OFgbtfQ+FIvMPfF7Sh8ZTjmz1Taqu7XuIS87ofuf4oAQNPYSMGb0nu+nYOGH9hZxWBNQj6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571333586; 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=uoKHrShfOPAUn47GW20hABBgh2KN1hcOeK5Wq7+CL6M=; b=QH4agmjHWgawypeSSS/gAyAStCbB2s3yF2GI9KmU5kveoLEUFBMxto+HSzqUD6ZCwOm6QypKt1+ITLCzp9Qs21CG+g5jOihDQLw0qg+aAneUcu2aLn4nFmTj9tGzA12lK4AGObvHJaKEtCP4aWP9ICpr5p1d8O+VosmbZ9E/JMA= 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 157133358655970.91098251250355; Thu, 17 Oct 2019 10:33:06 -0700 (PDT) Received: from localhost ([::1]:54436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9e3-0003uQ-51 for importer@patchew.org; Thu, 17 Oct 2019 13:33:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42712) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91L-0001OW-RD for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91K-0006gA-K7 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:03 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91K-0006fu-Dj; Thu, 17 Oct 2019 12:53:02 -0400 Received: by mail-wr1-x441.google.com with SMTP id o28so3163852wro.7; Thu, 17 Oct 2019 09:53:02 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:53:00 -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=uoKHrShfOPAUn47GW20hABBgh2KN1hcOeK5Wq7+CL6M=; b=gOhgq8GP5sYQEnSW9WK3rcpCFNDQEysr0bZf+j33qQ9INcqOoJ05Hbx3usMGHTxNY3 5f5/j02S3fp1D9KysZTFY1/BQXxjEh8K3tKaOHptqa9v6LzPSxYICaYrRA0o1QVKz54A 4WGdg2J8ctbGopmI3ApETFld5hSmZOrt9WUOmT2ms3rtKWRQF9I4ywSzucMyXN+Z/wwj iBzmLBPX88OHr1x2JBCJPMBcJzVMA9PdEWB1Qfj1cAmhbrJHGGaVo8VBS84zof3+Sl0s dskA98hxBTLMnHXAwZgWMBSnsu1MF37Q53DK+kjYdbJMqlr+epqdfFgJ8clYR/Qrbs9p fQpg== 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=uoKHrShfOPAUn47GW20hABBgh2KN1hcOeK5Wq7+CL6M=; b=hqzLhs1BOKVEopNqz8U5xdV8E6f8TnevDNz0UaVIlhqeXgqenqhOybY2UDtvJi9bi1 EfEXZqze9osQqQ2atp9Dh3goYt7fND8OvT9FHuzk+GDE7h4kZHIlH3j4K+PlO2prsSx8 PgOUsMcicWgJbJuoEeKAAsk6rbQtVxVAItm4iXWLe9o9SVZdz+BESyAsjCFfLFBm3Cap k7bLyw+POMFXUF2Fv6zRarIyy/XdOH0iUUKHduhyB1kWc3Tv6npevF2l+UpSRbj5xg99 4w9nIlqAzd0JdaNKuv4hqArNxYag5DMji08S7QabgNkT4s/CnnHN00HGQsaqti8cQlHk nP7A== X-Gm-Message-State: APjAAAXRyYac0SlDk4WI5LLofZR1e7fN0zYwA3vriQRx9izK+f/490ru CugbtyogTYjuZqzZL0XrEl4uI7ajjI0= X-Google-Smtp-Source: APXvYqwFMjkMxlqMJHq5vRSpIZ2CTxLrz/6a18DkzbUwXN7ZZEjDtoBlaGtf3DiFOYmq6yvkeGKjOg== X-Received: by 2002:a5d:6246:: with SMTP id m6mr4084034wrv.262.1571331181223; Thu, 17 Oct 2019 09:53:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 8/9] tests/acceptance: Test Sandalfoot initrd on the PReP/40p Date: Thu, 17 Oct 2019 18:52:38 +0200 Message-Id: <20191017165239.30159-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::441 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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) User case from: https://mail.coreboot.org/pipermail/openbios/2018-May/010360.html Sandalfoot info: http://www.juneau-lug.org/sandalfoot.php Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: - use avocado_qemu.wait_for_console_pattern (Cleber) - use exec_command_and_wait_for_pattern --- tests/acceptance/ppc_prep_40p.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_4= 0p.py index 0ebedd16c8..d022fe5ab0 100644 --- a/tests/acceptance/ppc_prep_40p.py +++ b/tests/acceptance/ppc_prep_40p.py @@ -10,6 +10,7 @@ import logging =20 from avocado import skipIf from avocado_qemu import Test +from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import wait_for_console_pattern =20 =20 @@ -94,3 +95,32 @@ class IbmPrep40pMachine(Test): =20 self.vm.launch() wait_for_console_pattern(self, 'NetBSD/prep BOOT, Revision 1.9') + + def test_sandalfoot_busybox(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:40p + """ + drive_url =3D ('http://www.juneau-lug.org/zImage.initrd.sandalfoot= ') + drive_hash =3D 'dacacfc4085ea51d34d99ef70e972b849e2c6949' + drive_path =3D self.fetch_asset(drive_url, asset_hash=3Ddrive_hash) + + self.vm.set_machine('40p') + self.vm.set_console() + self.vm.add_args('-cdrom', drive_path, + '-boot', 'd') + + self.vm.launch() + wait_for_console_pattern(self, 'Now booting the kernel') + + msg =3D 'Please press Enter to activate this console.' + wait_for_console_pattern(self, msg) + + version =3D 'BusyBox v0.60.0 (2001.08.19-09:26+0000) Built-in shel= l (ash)' + exec_command_and_wait_for_pattern(self, '', version) + + uname =3D 'Linux ppc 2.4.18 #5 Wed May 21 23:50:43 AKDT 2003 ppc u= nknown' + exec_command_and_wait_for_pattern(self, 'uname -a', uname) + + cpu =3D 'PReP IBM 6015/7020 (Sandalfoot/Sandalbow)' + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', cpu) --=20 2.21.0 From nobody Sat May 18 10:07:55 2024 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=1571332699; cv=none; d=zoho.com; s=zohoarc; b=kakvAlxgSQd8DS8YnIVbE07hl/IU9iVkzQFwNx+vZDsVsBSf0euZiAQQsb+EgZ2b7ADXf0ks0ANP+3+ww6/zLduOROau/9YusddTpoaoBMyN+nCekSEYmC2UJ0Ya5y5YunjhoQ8KWNPZjTCmAI/B8rwgNg4hmab6e0Ybvmx7A8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571332699; 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=KQeT1DkCT64ITk+vuTTSbwBhjZrtonMbDVqJGwi3dbY=; b=D25ueK303bUAAf6/Rlm1iKHhvjiMrnOHaM743R8fiw0GCzBi9oA1AeWSD1L9dvzNhob2QKzCk7DM90pWMxnb1LJ2uRdXsjE3Xr7Q+8pjgtZi3xzhUrBfMlGynTJWNtqqzqiaHf4rMr2+Z/dC/2POz9gfcHuZVvaT74ddZYRckLE= 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 1571332699258297.6754084308167; Thu, 17 Oct 2019 10:18:19 -0700 (PDT) Received: from localhost ([::1]:54120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL9Pe-0003jx-4d for importer@patchew.org; Thu, 17 Oct 2019 13:18:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42737) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL91N-0001R5-Fo for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL91M-0006gs-Hi for qemu-devel@nongnu.org; Thu, 17 Oct 2019 12:53:05 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL91M-0006ga-BK; Thu, 17 Oct 2019 12:53:04 -0400 Received: by mail-wr1-x443.google.com with SMTP id o18so3139020wrv.13; Thu, 17 Oct 2019 09:53:04 -0700 (PDT) Received: from x1w.redhat.com (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id w22sm2557363wmc.16.2019.10.17.09.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:53:02 -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=KQeT1DkCT64ITk+vuTTSbwBhjZrtonMbDVqJGwi3dbY=; b=lU+Kioq4ig5Ep79BvqHNOeGG4QcQu8sDdrww3nIIX/yJ5mj6+6MnOigZYVUU3oOeP0 so4cbVMiXRsddADWM0zrjc/7ElMke68NFrTdD47ShgXrdWOUhWzUPw0HYMSA2Tgg9Tuw F4f9zB4MH3KNFBIs1S4zCN/A6PV0eg2TF9XgzFKb6k4jQ4nteLjQQMaRTHUZ2ko8xMTo e92/zTzdfuiio0Q8XI9HRVzRDaFhBXdYyEjqstyNoNbBYnO24F1FczaG3zgr3/rro2Ci JYjuDuDTsmsCwVq057T8UI9u9rNRJEmoOc5d5+M94M2963SHIvWhD9QGhqtvy1Ki1vkM UgaQ== 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=KQeT1DkCT64ITk+vuTTSbwBhjZrtonMbDVqJGwi3dbY=; b=ilyCIoR/FsEj467nnuugqXjlliSwTQeVSs19HmqfM2Fdnn2cw/kxQM3vqN95QFdzvu YJVuyC5IDt8Sj/bbPsar8st3WSWZV8foPU+O44u6RUbzalpgnBXh8fM0l2vxwrWAIuA+ OKpv+kNpTBScsWdJxgvlMFeM7vPppGq32l0D97IZzf+Fe+5PcOvdv2mEQxiP/IIdsku9 +c04ylL4nAv5RJqQxhGEmC1jYVwCylurVNsnMH0QSehBLFpWT91eOBjhKIECJ81ybqsW j+eWTFCxvirk+kNfoFG1qNQd4D6nyucU6RHau7RGq0gDOZc1v7HT7QB4cb+N7i2PSrJu BDiw== X-Gm-Message-State: APjAAAUJOrLv0rXkg7LEHzMqDfSucMp8pGRxX8Qs8aRWxIra4ibKGPkF 88ei80gDWOIorkFXUcnD7WN/KUAwPaM= X-Google-Smtp-Source: APXvYqwgDkqdzP7ilQb7bLZzKCHzwACTuShyO9/ltzXs6C3kwuiY5rto0iJ4Ef+YLcU0bqHWvLYiyQ== X-Received: by 2002:adf:b1c6:: with SMTP id r6mr4073062wra.48.1571331183138; Thu, 17 Oct 2019 09:53:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 9/9] .travis.yml: Let the avocado job run the 40p tests Date: Thu, 17 Oct 2019 18:52:39 +0200 Message-Id: <20191017165239.30159-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017165239.30159-1-f4bug@amsat.org> References: <20191017165239.30159-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::443 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: Fam Zheng , Eduardo Habkost , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , qemu-ppc@nongnu.org, Artyom Tarasenko , Cleber Rosa , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Acked-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d0b9e099b9..69a37f7387 100644 --- a/.travis.yml +++ b/.travis.yml @@ -267,7 +267,7 @@ matrix: =20 # Acceptance (Functional) tests - env: - - CONFIG=3D"--python=3D/usr/bin/python3 --target-list=3Dx86_64-sof= tmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmm= u,alpha-softmmu,ppc64-softmmu,m68k-softmmu" + - CONFIG=3D"--python=3D/usr/bin/python3 --target-list=3Dx86_64-sof= tmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmm= u,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu" - TEST_CMD=3D"make check-acceptance" after_failure: - cat tests/results/latest/job.log --=20 2.21.0