From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g85EX-00010S-80 for qemu-devel@nongnu.org; Thu, 04 Oct 2018 11:08:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g85EL-0006ZV-Th for qemu-devel@nongnu.org; Thu, 04 Oct 2018 11:08:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46790) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g85EJ-0006Jh-Nw for qemu-devel@nongnu.org; Thu, 04 Oct 2018 11:07:56 -0400 References: <20181003183036.6716-1-philmd@redhat.com> <20181003183036.6716-4-philmd@redhat.com> From: Laszlo Ersek Message-ID: <2803f12b-9e59-58f4-9ca9-65819ef5492c@redhat.com> Date: Thu, 4 Oct 2018 17:07:27 +0200 MIME-Version: 1.0 In-Reply-To: <20181003183036.6716-4-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC PATCH v2 3/3] acceptance tests: Add EDK2 ArmVirtQemu boot and console checking test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Cleber Rosa , Eduardo Habkost , Caio Carrara Cc: qemu-devel@nongnu.org, =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Ard Biesheuvel On 10/03/18 20:30, Philippe Mathieu-Daud=C3=A9 wrote: > This test boots EDK2 ArmVirtQemu and check the debug console (PL011) re= ports enough > information on the initialized devices. >=20 > $ avocado run -p qemu_bin=3Daarch64-softmmu/qemu-system-aarch64 tests/a= cceptance/boot_firmware.py > JOB ID : cb1c5bd9e0312483eabeffbb37885a5273ef23bf > JOB LOG : /home/phil/avocado/job-results/job-2018-10-03T19.39-cb1c5b= d/job.log > (1/1) tests/acceptance/boot_firmware.py:BootFirmware.test_ovmf_virt: P= ASS (5.02 s) > RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 = | CANCEL 0 > JOB TIME : 5.30 s >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > The '-p' option requires Avocado >=3D 65.0 > --- > tests/acceptance/boot_firmware.py | 36 +++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) >=20 > diff --git a/tests/acceptance/boot_firmware.py b/tests/acceptance/boot_= firmware.py > index 2053b1a4b6..42f0672963 100644 > --- a/tests/acceptance/boot_firmware.py > +++ b/tests/acceptance/boot_firmware.py > @@ -121,3 +121,39 @@ class BootFirmware(Test): > debugcon_logger.debug(line.strip()) > for exp in expected: > self.assertIn(exp + '\r\n', content) > + > + def test_ovmf_virt(self): > + """ > + Boots OVMF on the default virt machine, checks the debug conso= le > + > + :avocado: tags=3Darch:aarch64 > + :avocado: tags=3Dmaxtime:20s > + """ > + image_url =3D ('http://snapshots.linaro.org/components/kernel/= ' > + 'leg-virt-tianocore-edk2-upstream/latest/' > + 'QEMU-AARCH64/DEBUG_GCC5/QEMU_EFI.img.gz') > + image_path_gz =3D self.fetch_asset(image_url) > + image_path =3D os.path.join(self.workdir, 'flash.img') > + > + # kludge until Avocado support gzip files > + import gzip, shutil > + with gzip.open(image_path_gz) as gz, open(image_path, 'wb') as= img: > + shutil.copyfileobj(gz, img) > + > + serial_path =3D os.path.join(self.workdir, 'serial.log') > + self.vm.set_machine('virt') > + self.vm.add_args('-nographic', > + '-cpu', 'cortex-a57', > + '-m', '1G', # 1GB min to boot fw? > + '-drive', 'file=3D%s,format=3Draw,if=3Dpflash= ' % image_path, > + '-chardev', 'file,path=3D%s,id=3Dconsole' % s= erial_path, > + '-serial', 'chardev:console') > + self.vm.launch() > + serial_logger =3D logging.getLogger('serial') > + > + # serial console checks > + if not wait_for(read_console_for_string, timeout=3D15, step=3D= 0, > + args=3D(open(serial_path), > + 'Start PXE over IPv4', > + serial_logger)): > + self.fail("OVMF failed to boot") >=20 I suggest replacing "OVMF" with "ArmVirtQemu" in comments and strings as well. I'd also suggest renaming the method test_ovmf_virt() to test_armvirtqemu_virt(). If that seems baroque, then I suggest "test_uefi_" in both patches #2 and #3. (Sorry about my obsession with these names; just trying to capture the existing "vernacular".) Thanks Laszlo