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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 0D328C433DB for ; Tue, 12 Jan 2021 18:56:51 +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 790D522CE3 for ; Tue, 12 Jan 2021 18:56:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 790D522CE3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzOqX-0004Hq-Er for qemu-devel@archiver.kernel.org; Tue, 12 Jan 2021 13:56:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzOkn-00080a-3k for qemu-devel@nongnu.org; Tue, 12 Jan 2021 13:50:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kzOkh-0003k3-6S for qemu-devel@nongnu.org; Tue, 12 Jan 2021 13:50:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610477443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M+XakeJTceh25MaGaIkk8/nsqpEJ5Rl2Ywa/cbZrY3M=; b=L4EBy6rJ/PEfudvICvHUv4ferqMZGOhsh490ME7IInY2QQIixPDCoq8IhB7Gjc5AhIFhce 8ZsN47mZPDEkq0P3N5Zx4YMp++rHw6sCMGhdoeeeVg3hVJ8A9ptgsjJ/70DAXnfQ9OK+Lp hsIRF3RHzLZHjqx02rwbjv7ozuWQUvI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-151-H-XBBuKxME6RfhDXVmDJNA-1; Tue, 12 Jan 2021 13:50:38 -0500 X-MC-Unique: H-XBBuKxME6RfhDXVmDJNA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0C651927805; Tue, 12 Jan 2021 18:50:36 +0000 (UTC) Received: from wainer-laptop.localdomain (ovpn-116-88.gru2.redhat.com [10.97.116.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 812785C239; Tue, 12 Jan 2021 18:50:29 +0000 (UTC) Subject: Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file To: Thomas Huth , qemu-devel@nongnu.org, David Gibson , Greg Kurz References: <20210112164045.98565-1-thuth@redhat.com> <20210112164045.98565-2-thuth@redhat.com> From: Wainer dos Santos Moschetta Message-ID: <6cb6f7dd-2f9e-05c3-0efe-8f7f9f75fe84@redhat.com> Date: Tue, 12 Jan 2021 15:50:26 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20210112164045.98565-2-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-ppc@nongnu.org, Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi, On 1/12/21 1:40 PM, Thomas Huth wrote: > Let's gather the POWER-related tests in a separate file. Did you consider having others ppc/ppc64 boot tests together too? Some candidates: tests/acceptance/boot_linux.py:BootLinuxPPC64.test_pseries_tcg tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc64_e500 tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_g3beige tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_mac99 tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_factory_firmware_and_netbsd tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_192m tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd > > Signed-off-by: Thomas Huth > --- > MAINTAINERS | 1 + > tests/acceptance/boot_linux_console.py | 19 -------------- > tests/acceptance/machine_ppc.py | 34 ++++++++++++++++++++++++++ > 3 files changed, 35 insertions(+), 19 deletions(-) > create mode 100644 tests/acceptance/machine_ppc.py Reviewed-by: Wainer dos Santos Moschetta > > diff --git a/MAINTAINERS b/MAINTAINERS > index 4be087b88e..189776a036 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -280,6 +280,7 @@ F: target/ppc/ > F: hw/ppc/ > F: include/hw/ppc/ > F: disas/ppc.c > +F: tests/acceptance/machine_ppc.py > > RISC-V TCG CPUs > M: Palmer Dabbelt > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index fb41bb7144..41d2c86e98 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -976,25 +976,6 @@ class BootLinuxConsole(LinuxKernelTest): > console_pattern = 'Kernel command line: %s' % kernel_command_line > self.wait_for_console_pattern(console_pattern) > > - def test_ppc64_pseries(self): > - """ > - :avocado: tags=arch:ppc64 > - :avocado: tags=machine:pseries > - """ > - kernel_url = ('https://archives.fedoraproject.org/pub/archive' > - '/fedora-secondary/releases/29/Everything/ppc64le/os' > - '/ppc/ppc64/vmlinuz') > - kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' > - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > - > - self.vm.set_console() > - kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0' > - self.vm.add_args('-kernel', kernel_path, > - '-append', kernel_command_line) > - self.vm.launch() > - console_pattern = 'Kernel command line: %s' % kernel_command_line > - self.wait_for_console_pattern(console_pattern) > - > def test_m68k_q800(self): > """ > :avocado: tags=arch:m68k > diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc.py > new file mode 100644 > index 0000000000..51bbfd411c > --- /dev/null > +++ b/tests/acceptance/machine_ppc.py > @@ -0,0 +1,34 @@ > +# Test that Linux kernel boots on ppc machines and check the console > +# > +# Copyright (c) 2018, 2020 Red Hat, Inc. > +# > +# This work is licensed under the terms of the GNU GPL, version 2 or > +# later. See the COPYING file in the top-level directory. > + > +from avocado_qemu import Test > +from avocado_qemu import wait_for_console_pattern > + > +class PpcMachine(Test): > + > + timeout = 90 > + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' > + panic_message = 'Kernel panic - not syncing' > + > + def test_ppc64_pseries(self): > + """ > + :avocado: tags=arch:ppc64 > + :avocado: tags=machine:pseries > + """ > + kernel_url = ('https://archives.fedoraproject.org/pub/archive' > + '/fedora-secondary/releases/29/Everything/ppc64le/os' > + '/ppc/ppc64/vmlinuz') > + kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' > + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > + > + self.vm.set_console() > + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0' > + self.vm.add_args('-kernel', kernel_path, > + '-append', kernel_command_line) > + self.vm.launch() > + console_pattern = 'Kernel command line: %s' % kernel_command_line > + wait_for_console_pattern(self, console_pattern, self.panic_message)