From nobody Mon May 13 19:31:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621086366; cv=none; d=zohomail.com; s=zohoarc; b=Eh3cLRzC4oE161GV8G9wAh5+Xo1o1rwSfvCzk8mZ6guDzOyOmUX4ds7x7+KNdTXdP/RK+x8lIM016snamOGKUOyrxlDuuQByWvX6kEzzf0OecMGnkWYW0szIlEGXqU+T6QR0g5ABOfzCZENFCcH5XIR4oIHPfzN9DFXNkE0TIkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621086366; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G8s61eN0lJK7kTgoNeT21G2dYt+87J3oMV0XWs16zIo=; b=jasprMwVdmOjel2NBT0G/qJd3nXgZBjvLNhedUqpPx5+4yQFoFEuFuPvgR5BsV7QOWR+a+JbC7ILFEvn1ADOazCq+FGwLpXDPTgnBzEaT2UjrBZuKvBuxdQFG2M0afebuzOJ32WRuBJTUKvSIvh7HDpZqpP52ZA5L0tBf1WpyVg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1621086365916174.7173653217527; Sat, 15 May 2021 06:46:05 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id z130so1112371wmg.2 for ; Sat, 15 May 2021 06:46:03 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id e20sm1300893wme.26.2021.05.15.06.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 May 2021 06:46:01 -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=G8s61eN0lJK7kTgoNeT21G2dYt+87J3oMV0XWs16zIo=; b=maP1gYzPaJouaW35ycnih8wS0VpxQNalAe0otrRDSgBfcBhXPejntVPtxHFavaZnCJ Ljsn/qlfJZIzspIpcmzKbMDABL9/6J6i0GeTM8H/yNv/yBH+nSR1eMlnZdryYkqVt4GR D+eCgAYiUtZnRcwqDP1Bq4W5znp1bCG5CvIKzQpK9ceGEAvBiNBWn/9kpuQzFWVX390s U43/8Ybgsq7avRzfi/oDPeVQAlpR39jmrjkZR2u748O6sah3z5YuMT/I8R4Tk1YuyrFq GbZrSb8gV0+3etW73T4+tBaqXuRZ5hmGzYxlEgw2eKnB/CZ5HElcYXWA6gf/vdIpMPqR ZtjA== 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=G8s61eN0lJK7kTgoNeT21G2dYt+87J3oMV0XWs16zIo=; b=swMhH/0JETZDAdrzahBMgmEcfGHdLSGb1TEDBtvehF8FTziOHliKOVWd9+xjgMPfjC wiCuVFGUfkGO36+w/1PrSsm2bBBPCacywnHdZYgxhRCChpYXtD44EFti6lv/I2TeabcC jCShqjywjpj5VUvTdrk+FUGLBgTDmSpIJ+gxh3iXa28saUPeHpz3MDohnlDMncJVVbYm BxktevmgdJFlhwImrCQzXhJ6/m2qCmRkzKQBS1Nc73GIeJudOXToH4zkUxX9VAlJRyDq bWA3vdxjiTcDWUb5NI6Rc05xpA0ngbtM1RdM8W3oGAbFMfsYxE+b/9XtxPW8NZOk/JnQ Hfng== X-Gm-Message-State: AOAM532yNUWJfZ3ovaKVPaRAo839NKEtIHiF/XGeSiiUnpILczktN940 P8psKs4N24Cc/mlHVisfB/8= X-Google-Smtp-Source: ABdhPJzlg2LQMKC8l6u3jq/Fy7ML3z3z5fCpru5Y2lCgRd6lqXG/9AIkZcf35zFMk+8OiW2HNcBobg== X-Received: by 2002:a05:600c:6d6:: with SMTP id b22mr27078112wmn.134.1621086362238; Sat, 15 May 2021 06:46:02 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-ppc@nongnu.org, BALATON Zoltan , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] tests/acceptance: Ignore binary data sent on serial console Date: Sat, 15 May 2021 15:45:54 +0200 Message-Id: <20210515134555.307404-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210515134555.307404-1-f4bug@amsat.org> References: <20210515134555.307404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) If a guest sends binary data on the serial console, we get: File "tests/acceptance/avocado_qemu/__init__.py", line 92, in _console_interaction msg =3D console.readline().strip() File "/usr/lib64/python3.8/codecs.py", line 322, in decode (result, consumed) =3D self._buffer_decode(data, self.errors, = final) UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa9 in position 2: in= valid start byte Since we use the console with readline(), fix it the easiest way possible: ignore binary data (all current tests compare text string anyway). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Tested-by: Wainer dos Santos Moschetta --- tests/acceptance/avocado_qemu/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 83b1741ec85..b55578e1cca 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -82,14 +82,17 @@ def _console_interaction(test, success_message, failure= _message, assert not keep_sending or send_string if vm is None: vm =3D test.vm - console =3D vm.console_socket.makefile() + console =3D vm.console_socket.makefile(mode=3D'rb', encoding=3D'utf-8') console_logger =3D logging.getLogger('console') while True: if send_string: vm.console_socket.sendall(send_string.encode()) if not keep_sending: send_string =3D None # send only once - msg =3D console.readline().strip() + try: + msg =3D console.readline().decode().strip() + except UnicodeDecodeError: + msg =3D None if not msg: continue console_logger.debug(msg) --=20 2.26.3 From nobody Mon May 13 19:31:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621086370; cv=none; d=zohomail.com; s=zohoarc; b=jUOUWgo70/PLizrO9P+R+Pb61JASPJenqthRluUFYCde0V0N28ILNXrQyJK9A33lZGei0xCykV3qlHuvRa+XsSDaI3JSD0aG6kXFqBbr00H4g5JI3sSZD3hmAPDO0AGHfghyi8jTRebadXkpIbublW5yEgw8TdxeuSmXQtdSWPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621086370; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2XZFRK9/LLw0BGiAUqsrQqTackDYMnMDegdSD7t3zQU=; b=P5A2T/SDzdzg/4CoWr15V9YG2H+Z8Uaes732a1na8MmcBNSzUA1URIXQvGxFcokpwAYwZIRtZ0EiazsdwJ2tFo1b8kdN10Xkb/1orUvQejSDbHG8t9SmPoIpudMOAlwC1eAl3tMigSMBRAOxYTJz2+jJUMY9swnvUWYoSsASCHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1621086369808299.9844424560889; Sat, 15 May 2021 06:46:09 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id s8so1841602wrw.10 for ; Sat, 15 May 2021 06:46:08 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id f3sm9278973wrp.7.2021.05.15.06.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 May 2021 06:46:06 -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=2XZFRK9/LLw0BGiAUqsrQqTackDYMnMDegdSD7t3zQU=; b=H+bloeOqZ0tfskx+FtfqKqFGuVsckcQX2c9rQ/iXn/vgsbYlhnncm1bsOTCNl+h+t3 QliZm961RE1PDtv7S1r+tx9UQecdSGMPsxAp+dUUKmyNpYyvAVrz+RmPuYx9NwuAYa7c Du14LcoQz0V6xsNZWT7Jjq5OlcHGZZritFKY7nYRG0bhrEufH9eAbX/YmP40PQ8NOmpD nlACDVoWETUTEYNYddFv4xcHXfIxhkZXncn+dTunzAebNWLl4qKnoFXySGBd+V1t0UD1 k/BwZbuvVNul6edcf5oun7KMpmIlIr/cQSr7fyYQYqacipNs3ZlITK2hn+0eI1rhqHja VBFQ== 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=2XZFRK9/LLw0BGiAUqsrQqTackDYMnMDegdSD7t3zQU=; b=Mb/zx5SdzzaGD6EEsOaft/aEd1PariJP1OfQ26QtUwX95Ozke/0OAoxrhYQBZ2Tndk cOSua61Z/xlL2pUcZqwKjDllQ4SboyEKtshb2Q+L3C6YOm884QkFr+Su82PI95gtKNMh lwwQE8DSBw3VzJTlj9gl6lTKPryNiaE+5BzAx8lv84qVZk/Rdio9J55KMFwVBOya8mhM GiBTkPTNxeDrNaBNciQcXTCB8RkI2Oh34+qZ2wz/o7auDrdmwYCttct04bnhGWIYMGtb Rl+Zx1pfnmKOgleYToBSsPnRJdOEeudrrzn3egAzICW4s15/VsoF20nPFIi8M2HQxVWQ BHYQ== X-Gm-Message-State: AOAM5316KoLL9RMSzuN9A3JG0evrgPheMAUqFZITBP/Na+2VXUJje56U sLM8fUq/Vsj8kNJFM5Wl0Mc= X-Google-Smtp-Source: ABdhPJywuEa1/ALQc81EQMZS66WkCLHghlSVhKwPcUHSI/hPE8HsKKFYcX5Udz1ragptLBWxlH/lKA== X-Received: by 2002:a5d:4d52:: with SMTP id a18mr64223223wru.45.1621086366985; Sat, 15 May 2021 06:46:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-ppc@nongnu.org, BALATON Zoltan , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] tests/acceptance: Add tests for the Pegasos2 machine Date: Sat, 15 May 2021 15:45:55 +0200 Message-Id: <20210515134555.307404-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210515134555.307404-1-f4bug@amsat.org> References: <20210515134555.307404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add a pair of tests for the Pegasos2 machine following the steps from: https://lists.nongnu.org/archive/html/qemu-devel/2021-01/msg01553.html $ PEGASOS2_ROM_PATH=3D/tmp/pegasos2.rom AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 \ avocado --show=3Dapp,console,tesseract \ run -t machine:pegasos2 tests/acceptance/ (1/2) tests/acceptance/machine_ppc_pegasos.py:PPCPegasos2.test_rom_seria= l_console: console: PegasosII Boot Strap (c) 2002-2003 bplan GmbH console: Running on CPU PVR:000C0209 console: Enable L1 ICache... = Done. console: Reading W83194 : = FAILED. console: Setting Front Side Bus to 133MHz... = FAILED. console: Configuring DDR... = Done. console: Configuring PCI0... = Done. console: Configuring PCI1... = Done. console: Configuring ETH... = Done. console: Releasing IDE reset ... = Done. console: Configuring Legacy Devices console: Initializing KBD... = Done. console: Testing 10000000 Bytes, Pass: 00000000 Failed: 00000000 console: RAM TEST (fill linear)... = Done. console: FFFFFFFF console: SmartFirmware: console: cpu0: PowerPC,G4 CPUClock 599 Mhz BUSClock 133 Mhz (Version 0x00= 0C,0x0209) console: no/bad nvramrc - performing default startup script console: channel 1 unit 0 : atapi | QEMU DVD-ROM = | 2.5+ console: ATA device not present or not responding console: Welcome to SmartFirmware(tm) for bplan Pegasos2 version 1.1 (200= 40405172512) PASS (5.23 s) (2/2) tests/acceptance/machine_ppc_pegasos.py:PPCPegasos2.test_morphos_c= drom_vga: ... console: Welcome to SmartFirmware(tm) for bplan Pegasos2 version 1.1 (200= 40405172512) console: SmartFirmware(tm) Copyright 1996-2001 by CodeGen, Inc. console: All Rights Reserved. console: Pegasos BIOS Extensions Copyright 2001-2003 by bplan GmbH. console: All Rights Reserved. console: entering main read/eval loop... console: ok boot cd boot.img console: ISO-9660 filesystem: System-ID: "MORPHOS" Volume-ID: "MorphOSB= oot" console: " flags=3D0x2 extent=3D0x20 size=3D0x1800 console: Memory used before SYS_Init: 9MB console: PCI ATA/ATAPI Driver@2: PIO Mode 4 console: PCI ATA/ATAPI Driver@2: UDMA Mode 5 console: ide.device@2: QEMU QEMU DVD-ROM console: ide.device@2: CDRom , found, bootable tesseract: Ambient Screen 4: Saturday, 15 May 2021, 13:36:06 & tesseract: keymap tesseract: Albanian keyboard with 101/104 keys tesseract: =E2=80=98American keyboard with Greek input extension, 105 keys tesseract: Belarusian keyboard with 105 keys tesseract: Belgian keyboard with 105 keys J tesseract: British Apple keyboard tesseract: British keyboard with 105 keys tesseract: Bulgarian keyboard with 104 keys tesseract: Canadian keyboard with 105 keys tesseract: Colemak layout for keyboards with 101/104 keys tesseract: Croatian keyboard with 101/108 keys tesseract: Czech keyboard (QWERTY) with 101/104 keys tesseract: Czech keyboard (QWERTZ) with 101/104 keys tesseract: Danish keyboard with 105 keys PASS (28.56 s) RESULTS : PASS 2 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 34.42 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: BALATON Zoltan --- tests/acceptance/machine_ppc_pegasos.py | 98 +++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 tests/acceptance/machine_ppc_pegasos.py diff --git a/tests/acceptance/machine_ppc_pegasos.py b/tests/acceptance/mac= hine_ppc_pegasos.py new file mode 100644 index 00000000000..d36e920ebde --- /dev/null +++ b/tests/acceptance/machine_ppc_pegasos.py @@ -0,0 +1,98 @@ +# Functional tests for the Pegasos2 machine. +# +# Copyright (c) 2021 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. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import time + +from avocado import skipUnless +from avocado_qemu import Test +from avocado_qemu import exec_command_and_wait_for_pattern +from avocado_qemu import wait_for_console_pattern +from tesseract_utils import tesseract_available, tesseract_ocr + +PIL_AVAILABLE =3D True +try: + from PIL import Image +except ImportError: + PIL_AVAILABLE =3D False + + +@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') +@skipUnless(os.getenv('PEGASOS2_ROM_PATH'), 'PEGASOS2_ROM_PATH not availab= le') +class PPCPegasos2(Test): + timeout =3D 60 + + def test_rom_serial_console(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:pegasos2 + :avocado: tags=3Ddevice:mv64361 + :avocado: tags=3Ddevice:vt8231 + """ + rom_hash =3D '3248e02596480f2dba5944bd219ecfad' + rom_path =3D self.fetch_asset('file://' + os.getenv('PEGASOS2_ROM_= PATH'), + asset_hash=3Drom_hash, algorithm=3D'md= 5') + + self.vm.set_console() + self.vm.add_args('-bios', rom_path) + self.vm.launch() + msg =3D 'PegasosII Boot Strap (c) 2002-2003 bplan GmbH' + wait_for_console_pattern(self, msg) + msg =3D 'Welcome to SmartFirmware(tm) for bplan Pegasos2 version 1= .1' + wait_for_console_pattern(self, msg) + + def test_morphos_cdrom_vga(self): + """ + :avocado: tags=3Darch:ppc + :avocado: tags=3Dmachine:pegasos2 + :avocado: tags=3Ddevice:mv64361 + :avocado: tags=3Ddevice:vt8231 + :avocado: tags=3Ddevice:ati-vga + """ + rom_hash =3D '3248e02596480f2dba5944bd219ecfad' + rom_path =3D self.fetch_asset('file://' + os.getenv('PEGASOS2_ROM_= PATH'), + asset_hash=3Drom_hash, algorithm=3D'md= 5') + iso_url =3D 'https://www.morphos-team.net/morphos-3.15.iso' + iso_hash =3D 'a19dbfbbc4728e0ba9ceb6335db69ca4' + iso_path =3D self.fetch_asset(iso_url, + asset_hash=3Diso_hash, algorithm=3D'md= 5') + + self.vm.set_console() + self.vm.add_args('-bios', rom_path, + '-device', 'ati-vga,romfile=3D', + '-cdrom', iso_path) + self.vm.launch() + msg =3D 'Welcome to SmartFirmware(tm) for bplan Pegasos2 version 1= .1' + wait_for_console_pattern(self, msg) + wait_for_console_pattern(self, 'entering main read/eval loop...') + msg =3D 'filesystem: System-ID: "MORPHOS" Volume-ID: "MorphOSBoo= t"' + exec_command_and_wait_for_pattern(self, 'boot cd boot.img', msg) + + msg =3D 'ide.device@2: CDRom , found, bootable' + wait_for_console_pattern(self, msg) + if PIL_AVAILABLE: + delay_s =3D 20 if tesseract_available(4) else 8 + + self.log.info('VM launched, waiting for display') + # TODO: Use avocado.utils.wait.wait_for to catch the + # 'displaysurface_create 1120x832' trace-event. + time.sleep(delay_s) + + screenshot_path =3D os.path.join(self.workdir, "dump.ppm") + self.vm.command('human-monitor-command', + command_line=3D'screendump %s' % screenshot_pa= th) + width, height =3D Image.open(screenshot_path).size + self.assertEqual(width, 2048) + self.assertEqual(height, 1152) + + if tesseract_available(4): + lines =3D tesseract_ocr(screenshot_path, tesseract_version= =3D4) + text =3D '\n'.join(lines) + msg =3D 'American keyboard with Greek input extension, 105= keys' + self.assertIn(msg, text) --=20 2.26.3