From nobody Thu Sep 19 16:43:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1725025277; cv=none; d=zohomail.com; s=zohoarc; b=EprDfYqJ/Fts4mG4GBOe6SDjKT9CjAoQHBm4ZZaCVJJ5sojZK/jPngvt37OFnOau/m8yunOxIussiblgNMStpVILG9aWqZDNpjWo5xSG0ujUR/z+XozJ43qddfcKIdwDXXSHwCVwjK53cT8Bm9jSbliUEH4nFtoubkZLF7RlUJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725025277; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wZxKg14rh0yxMkEsXaaPd4X7q8JDRrbuFoST72D7jxk=; b=P6zUv9RwnLkie++wTWP/xh7kZDzjKSvrpkChVbdy7qgoW9UPsScuTynEc9kryRV8+5gqH/pPP88W9ICBd40nrCfuSWuXgq1f+ucKCXN08zykc0JGxzkx2KmHJWgiqSOmQGa8BMedtabK1zHs1kZXoZqvs+0qloXDBbjG7zh0nNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725025277022877.5182578042601; Fri, 30 Aug 2024 06:41:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sk1sE-00068E-HS; Fri, 30 Aug 2024 09:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sk1s8-0005dz-RL for qemu-devel@nongnu.org; Fri, 30 Aug 2024 09:41:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sk1s5-0005Zh-Hf for qemu-devel@nongnu.org; Fri, 30 Aug 2024 09:41:04 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-ox6i0WZiOUuxML3X3ny2mw-1; Fri, 30 Aug 2024 09:40:56 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C672319560B0; Fri, 30 Aug 2024 13:40:55 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.7]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 930D5300019C; Fri, 30 Aug 2024 13:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725025260; 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=wZxKg14rh0yxMkEsXaaPd4X7q8JDRrbuFoST72D7jxk=; b=LnORaHdbO24ooZZx5/wfy1tqS3wQbPnCLnFZ0EqgyM+isuXWdQy0IgKCi//hUN5KKjg99W Q4Z5eUQ1fk1hMHRUm0Uzh3Bm9v2ERuFR1IYzYifiFump73eTn8Gqemk8luQb7+fR7lLai1 eWco8NOa7saRnW5E2S7jyLDCY1wdxvk= X-MC-Unique: ox6i0WZiOUuxML3X3ny2mw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ani Sinha , Richard Henderson , John Snow , Fabiano Rosas Subject: [PATCH v5 28/44] tests/functional: Convert the m68k nextcube test with tesseract Date: Fri, 30 Aug 2024 15:38:22 +0200 Message-ID: <20240830133841.142644-29-thuth@redhat.com> In-Reply-To: <20240830133841.142644-1-thuth@redhat.com> References: <20240830133841.142644-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1725025278818116600 The code that handles running of tesseract needs to be tweaked a little bit to be able to run without the functions from avocado.utils, and while we're at it, drop some legacy stuff that was still there due to Tesseract 3 support that we already dropped a while ago. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + tests/avocado/tesseract_utils.py | 46 ------------------- tests/functional/meson.build | 4 ++ tests/functional/qemu_test/tesseract.py | 35 ++++++++++++++ .../test_m68k_nextcube.py} | 29 ++++++------ 5 files changed, 56 insertions(+), 59 deletions(-) delete mode 100644 tests/avocado/tesseract_utils.py create mode 100644 tests/functional/qemu_test/tesseract.py rename tests/{avocado/machine_m68k_nextcube.py =3D> functional/test_m68k_n= extcube.py} (75%) mode change 100644 =3D> 100755 diff --git a/MAINTAINERS b/MAINTAINERS index cca48683ce..394d704515 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1283,6 +1283,7 @@ S: Odd Fixes F: hw/m68k/next-*.c F: hw/display/next-fb.c F: include/hw/m68k/next-cube.h +F: tests/functional/test_m68k_nextcube.py =20 q800 M: Laurent Vivier diff --git a/tests/avocado/tesseract_utils.py b/tests/avocado/tesseract_uti= ls.py deleted file mode 100644 index 476f528147..0000000000 --- a/tests/avocado/tesseract_utils.py +++ /dev/null @@ -1,46 +0,0 @@ -# ... -# -# Copyright (c) 2019 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 re -import logging - -from avocado.utils import process -from avocado.utils.path import find_command, CmdNotFoundError - -def tesseract_available(expected_version): - try: - find_command('tesseract') - except CmdNotFoundError: - return False - res =3D process.run('tesseract --version') - try: - version =3D res.stdout_text.split()[1] - except IndexError: - version =3D res.stderr_text.split()[1] - return int(version.split('.')[0]) >=3D expected_version - - match =3D re.match(r'tesseract\s(\d)', res) - if match is None: - return False - # now this is guaranteed to be a digit - return int(match.groups()[0]) >=3D expected_version - - -def tesseract_ocr(image_path, tesseract_args=3D'', tesseract_version=3D3): - console_logger =3D logging.getLogger('tesseract') - console_logger.debug(image_path) - if tesseract_version =3D=3D 4: - tesseract_args +=3D ' --oem 1' - proc =3D process.run("tesseract {} {} stdout".format(tesseract_args, - image_path)) - lines =3D [] - for line in proc.stdout_text.split('\n'): - sline =3D line.strip() - if len(sline): - console_logger.debug(sline) - lines +=3D [sline] - return lines diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 1b2e6d142c..3a71e02e74 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -44,6 +44,10 @@ tests_loongarch64_system_thorough =3D [ 'loongarch64_virt', ] =20 +tests_m68k_system_thorough =3D [ + 'm68k_nextcube' +] + tests_microblaze_system_thorough =3D [ 'microblaze_s3adsp1800' ] diff --git a/tests/functional/qemu_test/tesseract.py b/tests/functional/qem= u_test/tesseract.py new file mode 100644 index 0000000000..c4087b7c11 --- /dev/null +++ b/tests/functional/qemu_test/tesseract.py @@ -0,0 +1,35 @@ +# ... +# +# Copyright (c) 2019 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 re +import logging + +from . import has_cmd, run_cmd + +def tesseract_available(expected_version): + if not has_cmd('tesseract'): + return False + (stdout, stderr, ret) =3D run_cmd([ 'tesseract', '--version']) + if ret: + return False + version =3D stdout.split()[1] + return int(version.split('.')[0]) >=3D expected_version + +def tesseract_ocr(image_path, tesseract_args=3D''): + console_logger =3D logging.getLogger('console') + console_logger.debug(image_path) + (stdout, stderr, ret) =3D run_cmd(['tesseract', image_path, + 'stdout']) + if ret: + return None + lines =3D [] + for line in stdout.split('\n'): + sline =3D line.strip() + if len(sline): + console_logger.debug(sline) + lines +=3D [sline] + return lines diff --git a/tests/avocado/machine_m68k_nextcube.py b/tests/functional/test= _m68k_nextcube.py old mode 100644 new mode 100755 similarity index 75% rename from tests/avocado/machine_m68k_nextcube.py rename to tests/functional/test_m68k_nextcube.py index 1f3c883910..89385a134a --- a/tests/avocado/machine_m68k_nextcube.py +++ b/tests/functional/test_m68k_nextcube.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Functional test that boots a VM and run OCR on the framebuffer # # Copyright (c) 2019 Philippe Mathieu-Daud=C3=A9 @@ -8,10 +10,10 @@ import os import time =20 -from avocado_qemu import QemuSystemTest -from avocado import skipUnless +from qemu_test import QemuSystemTest, Asset +from unittest import skipUnless =20 -from tesseract_utils import tesseract_available, tesseract_ocr +from qemu_test.tesseract import tesseract_available, tesseract_ocr =20 PIL_AVAILABLE =3D True try: @@ -21,19 +23,15 @@ =20 =20 class NextCubeMachine(QemuSystemTest): - """ - :avocado: tags=3Darch:m68k - :avocado: tags=3Dmachine:next-cube - :avocado: tags=3Ddevice:framebuffer - """ =20 timeout =3D 15 =20 + ASSET_ROM =3D Asset(('https://sourceforge.net/p/previous/code/1350/tre= e/' + 'trunk/src/Rev_2.5_v66.BIN?format=3Draw'), + '1b753890b67095b73e104c939ddf62eca9e7d0aedde5108e389= 3b0ed9d8000a4') + def check_bootrom_framebuffer(self, screenshot_path): - rom_url =3D ('https://sourceforge.net/p/previous/code/1350/tree/' - 'trunk/src/Rev_2.5_v66.BIN?format=3Draw') - rom_hash =3D 'b3534796abae238a0111299fc406a9349f7fee24' - rom_path =3D self.fetch_asset(rom_url, asset_hash=3Drom_hash) + rom_path =3D self.ASSET_ROM.fetch() =20 self.vm.add_args('-bios', rom_path) self.vm.launch() @@ -48,6 +46,7 @@ def check_bootrom_framebuffer(self, screenshot_path): =20 @skipUnless(PIL_AVAILABLE, 'Python PIL not installed') def test_bootrom_framebuffer_size(self): + self.set_machine('next-cube') screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) =20 @@ -60,11 +59,15 @@ def test_bootrom_framebuffer_size(self): # that it is still alpha-level software. @skipUnless(tesseract_available(4), 'tesseract OCR tool not available') def test_bootrom_framebuffer_ocr_with_tesseract(self): + self.set_machine('next-cube') screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) - lines =3D tesseract_ocr(screenshot_path, tesseract_version=3D4) + lines =3D tesseract_ocr(screenshot_path) text =3D '\n'.join(lines) self.assertIn('Testing the FPU', text) self.assertIn('System test failed. Error code', text) self.assertIn('Boot command', text) self.assertIn('Next>', text) + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.46.0