From nobody Mon Feb 9 06:46:19 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565704231; cv=none; d=zoho.com; s=zohoarc; b=iQJ8NftaSXs1lPgpgajZeVmH1Nc1AZYdEiCjaukv6pFYVdK6YlX9vv0rRserdMSM3mx46RE4J4MFsRiDcjKy12cSQsvT8yL5euMyzH4ibeY12fLUjZDRdl4UGt4RqqZ5N4XXEwK5T9O5M3DLY+Wpy1WiK3wXaanCXGVtP5+hRKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565704231; 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:ARC-Authentication-Results; bh=4WHV5YmpO+8pzFtq3rVs6rNirdcOstlaiX8cZyN0OMw=; b=Uh6ss0dI4a6fbPEHwLr+XCccCtfnigJzIByyR+TBW3Ay4aS0daslhCVaew/uGQMb7mdrqQprFZr8/ncFiXD1IdMZwS6/9MUN64KgI+y8qkPftXnfSM0dJ8sqEEknEC2Yo2lrYEZJDtQyoVsMgdAVlLFzMZdDGGPL2K+XNLTOCs0= ARC-Authentication-Results: i=1; mx.zoho.com; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565704231455892.7934080261485; Tue, 13 Aug 2019 06:50:31 -0700 (PDT) Received: from localhost ([::1]:52547 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxXBy-0007eN-F2 for importer@patchew.org; Tue, 13 Aug 2019 09:50:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34477) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxXBH-0006PV-PQ for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxXBG-0005uc-5E for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxXBF-0005uK-Tq for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:42 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D0A6C0035C2; Tue, 13 Aug 2019 13:49:41 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.129]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F2231001281; Tue, 13 Aug 2019 13:49:35 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 15:49:19 +0200 Message-Id: <20190813134921.30602-2-philmd@redhat.com> In-Reply-To: <20190813134921.30602-1-philmd@redhat.com> References: <20190813134921.30602-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 13 Aug 2019 13:49:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/3] tests/acceptance: Add test of NeXTcube framebuffer using OCR 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 , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Gerd Hoffmann , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Add a test of the NeXTcube framebuffer using the Tesseract OCR engine on a screenshot of the framebuffer device. The test is very quick: $ avocado --show=3Dapp,console run tests/acceptance/machine_m68k_nextcube= .py JOB ID : 78844a92424cc495bd068c3874d542d1e20f24bc JOB LOG : /home/phil/avocado/job-results/job-2019-08-13T13.16-78844a9/= job.log (1/3) tests/acceptance/machine_m68k_nextcube.py:NextCubeMachine.test_boo= trom_framebuffer_size: PASS (2.16 s) (2/3) tests/acceptance/machine_m68k_nextcube.py:NextCubeMachine.test_boo= trom_framebuffer_ocr_with_tesseract_v3: - ue r pun Honl'=EF=AC=82x ; 5=E2=80=98 55=E2=80=98 avg ncaaaaa 25 MHZ, memary jag m Backplane slat =C2=ABa Ethernet address a a r a r3 2 Memgry sackets aea canflqured far 16MB Darlly page made stMs but have 16M= B page made stMs )nstalled Memgry sackets a and 1 canflqured far 16MB Darlly page made stMs but have= 16MB page made stMs )nstalled [...] Yestlnq the rpu, 5:: system test raneg Errar egge 51 Egg: cammand Default pggc devlce nut fauna NEXY>I PASS (2.64 s) (3/3) tests/acceptance/machine_m68k_nextcube.py:NextCubeMachine.test_boo= trom_framebuffer_ocr_with_tesseract_v4: SKIP: tesseract v4 OCR tool not ava= ilable RESULTS : PASS 2 | ERROR 0 | FAIL 0 | SKIP 1 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 5.35 s Documentation on how to install tesseract: https://github.com/tesseract-ocr/tesseract/wiki#installation Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: - test fb sizes - handle 2 versions of teseract v3: - sort imports - use of ALL_CAPS variables if they are at the module level (PIL_AVAILABLE) - use find_command from avocado.utils.path - check tesseract version using regex to avoid exceptions - do not use '-' in avocado tags - use use os.path.join() - add few comments --- tests/acceptance/machine_m68k_nextcube.py | 121 ++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 tests/acceptance/machine_m68k_nextcube.py diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py new file mode 100644 index 0000000000..e09cab9f20 --- /dev/null +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -0,0 +1,121 @@ +# Functional test that boots a VM and run OCR on the framebuffer +# +# 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 re +import time +import logging +import distutils.spawn + +from avocado_qemu import Test +from avocado import skipUnless +from avocado.utils import process +from avocado.utils.path import find_command, CmdNotFoundError + +PIL_AVAILABLE =3D True +try: + from PIL import Image +except ImportError: + PIL_AVAILABLE =3D False + + +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=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=3D expected_version + + +class NextCubeMachine(Test): + + timeout =3D 15 + + def check_bootrom_framebuffer(self, screenshot_path): + rom_url =3D ('http://www.nextcomputers.org/NeXTfiles/Software/ROM_= Files/' + '68040_Non-Turbo_Chipset/Rev_2.5_v66.BIN') + rom_hash =3D 'b3534796abae238a0111299fc406a9349f7fee24' + rom_path =3D self.fetch_asset(rom_url, asset_hash=3Drom_hash) + + self.vm.set_machine('next-cube') + self.vm.add_args('-bios', rom_path) + self.vm.launch() + + 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(2) + + self.vm.command('human-monitor-command', + command_line=3D'screendump %s' % screenshot_path) + + @skipUnless(PIL_AVAILABLE, 'Python PIL not installed') + def test_bootrom_framebuffer_size(self): + """ + :avocado: tags=3Darch:m68k + :avocado: tags=3Dmachine:next_cube + :avocado: tags=3Ddevice:framebuffer + """ + screenshot_path =3D os.path.join(self.workdir, "dump.png") + self.check_bootrom_framebuffer(screenshot_path) + + width, height =3D Image.open(screenshot_path).size + self.assertEqual(width, 1120) + self.assertEqual(height, 832) + + @skipUnless(tesseract_available(3), 'tesseract v3 OCR tool not availab= le') + def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): + """ + :avocado: tags=3Darch:m68k + :avocado: tags=3Dmachine:next_cube + :avocado: tags=3Ddevice:framebuffer + """ + screenshot_path =3D os.path.join(self.workdir, "dump.png") + self.check_bootrom_framebuffer(screenshot_path) + + console_logger =3D logging.getLogger('console') + text =3D process.run("tesseract %s stdout" % screenshot_path).stdo= ut_text + for line in text.split('\n'): + if len(line): + console_logger.debug(line) + self.assertIn('Backplane', text) + self.assertIn('Ethernet address', text) + + # Tesseract 4 adds a new OCR engine based on LSTM neural networks. The + # new version is faster and more accurate than version 3. The drawback= is + # that it is still alpha-level software. + @skipUnless(tesseract_available(4), 'tesseract v4 OCR tool not availab= le') + def test_bootrom_framebuffer_ocr_with_tesseract_v4(self): + """ + :avocado: tags=3Darch:m68k + :avocado: tags=3Dmachine:next_cube + :avocado: tags=3Ddevice:framebuffer + """ + screenshot_path =3D os.path.join(self.workdir, "dump.png") + self.check_bootrom_framebuffer(screenshot_path) + + console_logger =3D logging.getLogger('console') + proc =3D process.run("tesseract --oem 1 %s stdout" % screenshot_pa= th) + text =3D proc.stdout_text + for line in text.split('\n'): + if len(line): + console_logger.debug(line) + self.assertIn('Testing the FPU, SCC', text) + self.assertIn('System test failed. Error code 51', text) + self.assertIn('Boot command', text) + self.assertIn('Next>', text) --=20 2.20.1 From nobody Mon Feb 9 06:46:19 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565704230; cv=none; d=zoho.com; s=zohoarc; b=Rn+Ic60vVe0dwAu1gQqIAUMSFcbRIEPZIYEWEpOj57h28uZRavKvbuKg9WcDcgy4+9TIxAi2YEE7ihgSzM64ktWhBGeMEp5gJ7Gy7SwrylifTrSsfO3vGf6zWbp2+QNqeGrWhjUON3TbTLv1K2eBaqGfCpNy6gOC7uh55DdbSWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565704230; 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:ARC-Authentication-Results; bh=BthaXhCk7GAOahWZ4L8FWNRAzvsfRtBiYwwwknQPzo8=; b=oCjvxiXdJG7fB/2D57bASKd9YIeKPlHOZLUySnds7hapWCRPWBIGK4eFBdLbm0D3DSyDlgSKcub86ULbzvGyEfjiZUkzcVjT64oSw4Y6b8/lvEHN1HvuZVZQ/Tm742GN1w8UIW88sbOJCszh37IJ2J6jz1VT0JH77UeFDJNTXrw= ARC-Authentication-Results: i=1; mx.zoho.com; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565704230466396.42939009165093; Tue, 13 Aug 2019 06:50:30 -0700 (PDT) Received: from localhost ([::1]:52548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxXC1-0007sH-KA for importer@patchew.org; Tue, 13 Aug 2019 09:50:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34489) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxXBK-0006UZ-PN for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxXBJ-0005wR-SO for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42364) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxXBJ-0005w6-NH for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04F93300144D; Tue, 13 Aug 2019 13:49:45 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.129]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C56A510013A1; Tue, 13 Aug 2019 13:49:41 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 15:49:20 +0200 Message-Id: <20190813134921.30602-3-philmd@redhat.com> In-Reply-To: <20190813134921.30602-1-philmd@redhat.com> References: <20190813134921.30602-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 13 Aug 2019 13:49:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/3] .travis.yml: Let the avocado job run the NeXTcube tests 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 , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Gerd Hoffmann , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: - install tesseract English package (Thomas) - install PIL --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index caf0a1f8fa..f6dea2492c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -232,15 +232,20 @@ 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" + - 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,m68k-softmmu" - TEST_CMD=3D"make check-acceptance" after_failure: - cat tests/results/latest/job.log addons: apt: packages: + - python3-pil - python3-pip - python3.5-venv + - tesseract-ocr + - tesseract-ocr-eng + + # Using newer GCC with sanitizers - addons: apt: --=20 2.20.1 From nobody Mon Feb 9 06:46:19 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565704276; cv=none; d=zoho.com; s=zohoarc; b=V7GROB81E6bMv8+6gN7Zkyn4nbPK3ew2p2s3dmzE4NrBzLsGPYl24nFxHRxThAtDnE79DFwpR2P0srAabIJ0NblQAx5ZRSe32tzyEFr+Q0WkmT+mcDZek+FFB8bYWj97gs3MzjHfE4xpUVCZp7An51Hr/AmsP1k2P9nDXs+x8p0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565704276; 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:ARC-Authentication-Results; bh=+/yZl5PQJaCgTR91No2d2w49EBINkXAjhUDjtT6w+DM=; b=mQX69kAQn42mFMBDjD9FT0uGyb7hSYyMGjBheNZf9wDkbpbCWqP/9QXUJznX560V2pXDToFUZwnVpbOfpi5QZWDEtiBPjP6olZPjrKFsBPdXlOp5U0iLcIhI05mu0wRQwdjUVzughXbpxeGS66rloN1UeirT97a4d3yy05euJdQ= ARC-Authentication-Results: i=1; mx.zoho.com; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565704276825679.5532110920411; Tue, 13 Aug 2019 06:51:16 -0700 (PDT) Received: from localhost ([::1]:52558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxXCl-0000sE-W8 for importer@patchew.org; Tue, 13 Aug 2019 09:51:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34507) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxXBV-00071b-OW for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxXBU-00060N-F8 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37806) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxXBU-000609-7a for qemu-devel@nongnu.org; Tue, 13 Aug 2019 09:49:56 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88EBB8E591; Tue, 13 Aug 2019 13:49:55 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.129]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 78CC510013A1; Tue, 13 Aug 2019 13:49:45 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 15:49:21 +0200 Message-Id: <20190813134921.30602-4-philmd@redhat.com> In-Reply-To: <20190813134921.30602-1-philmd@redhat.com> References: <20190813134921.30602-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 13 Aug 2019 13:49:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH v3 3/3] tests/acceptance: Run commands sending VNC keys 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 , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Gerd Hoffmann , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Proof of concept to interract with a framebuffer via VNC. This test send 'mem' and 'help' to the firmware prompt within the single X terminal opened. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- This test is limited because the '-vnc' option only allow to bind TCP port. To allow parallel testing, I should try to bind within a range instead of ':0'. --- tests/acceptance/machine_m68k_nextcube.py | 49 +++++++++++++++++++++++ tests/requirements.txt | 1 + 2 files changed, 50 insertions(+) diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py index e09cab9f20..f4f853dfa1 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -13,6 +13,7 @@ import distutils.spawn =20 from avocado_qemu import Test from avocado import skipUnless +from vncdotool import api as vnc from avocado.utils import process from avocado.utils.path import find_command, CmdNotFoundError =20 @@ -119,3 +120,51 @@ class NextCubeMachine(Test): self.assertIn('System test failed. Error code 51', text) self.assertIn('Boot command', text) self.assertIn('Next>', text) + + + @staticmethod + def vnc_send_string(client, string, eol=3DTrue): + for key in string: + client.keyPress(key) + time.sleep(0.02) + if eol: + client.keyPress('enter') + time.sleep(0.02) + + @skipUnless(tesseract_available(3), 'tesseract v3 OCR tool not availab= le') + def test_bootrom_via_vnc_with_tesseract_v3(self): + """ + :avocado: tags=3Darch:m68k + :avocado: tags=3Dmachine:next_cube + :avocado: tags=3Ddevice:framebuffer + """ + screenshot_path =3D os.path.join(self.workdir, "dump.png") + + rom_url =3D ('http://www.nextcomputers.org/NeXTfiles/Software/ROM_= Files/' + '68040_Non-Turbo_Chipset/Rev_2.5_v66.BIN') + rom_hash =3D 'b3534796abae238a0111299fc406a9349f7fee24' + rom_path =3D self.fetch_asset(rom_url, asset_hash=3Drom_hash) + + self.vm.set_machine('next-cube') + self.vm.add_args('-bios', rom_path, + '-vnc', ':0') # XXX do not use static TCP port... + self.vm.launch() + + 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(2) + + with vnc.connect('127.0.0.1') as client: + self.vnc_send_string(client, 'help') + self.vnc_send_string(client, 'mem') + client.captureScreen(screenshot_path) + client.disconnect() + + console_logger =3D logging.getLogger('console') + text =3D process.run("tesseract %s stdout" % screenshot_path).stdo= ut_text + for line in text.split('\n'): + if len(line): + console_logger.debug(line) + self.assertIn('address space', text) + self.assertIn('System', text) diff --git a/tests/requirements.txt b/tests/requirements.txt index 3ae0e29ad7..f7467287a1 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -3,3 +3,4 @@ # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 avocado-framework=3D=3D68.0 paramiko +vncdotool --=20 2.20.1