From nobody Sun May 19 14:40:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603277444; cv=none; d=zohomail.com; s=zohoarc; b=knNXtZGg+Z90SLgaa+YuvIQ0bRrLDQ43mWooAecBZ1l5RU3LfSRdgLOeDcNyLv1CJWN099fd81s3fq8qhuDhIhnxM30Q5ygdCAxpsMIq5fLPP60Y8pU544NFfCn4uHpFRWCbRFW7VvFU3c0y56LlcULs/lUwoFzkE+XCIzMqYnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603277444; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SenI/m4MVR8+NEEf8DYCWuc6xCFneoK33J1yat7CMnQ=; b=VBeDG2NqtkY5wxmLnr4zLXyrCAMB5SeSOqkjyHRqD8Dr7tyToxwpeLT+D0GS5aopdwr/QJl5RYDrr9C1vpaWmirTwk1DNyDuxADvGM1DiXx98txw0yvzPxzghtnb5wxMzwJarFKsICl0Yx0Y2AgT6YhhB45zaimC5bbLOVfIfGM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1603277444358208.34125347372208; Wed, 21 Oct 2020 03:50:44 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id i1so2606200wro.1 for ; Wed, 21 Oct 2020 03:50:43 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id u195sm2910068wmu.18.2020.10.21.03.50.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 03:50:42 -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=SenI/m4MVR8+NEEf8DYCWuc6xCFneoK33J1yat7CMnQ=; b=ShXjz51LTHeUnMo9Z93PYgblwftpUaBC/j4xroc7mvpmzWc2GAXbMBcCPni1SkOsMs 9KWoQ2TUawPOR9a/jQDWpuEk7h3dlgh6k4Ns2b5oO68YHu0464xnwY71MyQP+rMrtcXc ruQ3jsGIEeFPFxDiVPZXJb78/qv/5BXrkJCbd3Ac5wkCxFXAq+NSiv5sdjpEGLMIPnZA 611QuJz73yRGUvYznoKIL8KIqjPCYWiQNFU1nuqdE0ylSRsg9avsT+dYla056KKoMfy9 menkbXbaSM/eSygNX8e1VwbTQjpCW+8qaJNi7T6KolXNwsA7vyLvPP/lZz0IA3HaRjvW 0cVQ== 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=SenI/m4MVR8+NEEf8DYCWuc6xCFneoK33J1yat7CMnQ=; b=bpb4OZpY3qhcrcdRPRjnjUyUiMUrWw3kPgWH9Fumnqc0sYDhcDm8LUj264I6yw9K1O aP+zeCM6P6p00QW7IOu5yoWP0xlk0vCWH7lR+HBUosdBl+NnkMDmh1vK30gLqfPL34RJ YKNR2Q3UAYlDxgeSY9BKwGHwVp7/8skkzlwivuFROj2UXe9ep8YXeJXWN2ZJX3+J1ChI nARAt1Pl4QTBLhO5+AmcOCc05wqdjjoRZZ+4iS1o/ePHpQHzDE7qYdaHEb1cF1hnQQQT gv0txDRD/sgclNW+TMc+iWZYQO6Nsy1dguIGLvb6tLTTbDXEXLK3ZfE6xfxEfNhNyyLv Ub5Q== X-Gm-Message-State: AOAM533oUxWIlk3gvYHLh6o0kJEHHllh3JLDVg3MkggolnYlg59LJNh0 S0UCmFY2A/bpY8uP4CNXBpA= X-Google-Smtp-Source: ABdhPJzQASHdZneSo8xHkPK+4PCMLsJ7tmRs70aOHofxRuo8HOc8WbWzB7eED4dEA/gGy3O6E6J6xA== X-Received: by 2002:adf:e685:: with SMTP id r5mr4302071wrm.340.1603277442931; Wed, 21 Oct 2020 03:50:42 -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: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Thomas Huth , Wainer dos Santos Moschetta , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mark Cave-Ayland , Cleber Rosa Subject: [PATCH 1/6] tests/acceptance: Remove unused import Date: Wed, 21 Oct 2020 12:50:30 +0200 Message-Id: <20201021105035.2477784-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021105035.2477784-1-f4bug@amsat.org> References: <20201021105035.2477784-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Thomas Huth --- tests/acceptance/machine_m68k_nextcube.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py index 32cf571f948..9d289f2fab7 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -9,7 +9,6 @@ import re import time import logging -import distutils.spawn =20 from avocado_qemu import Test from avocado import skipUnless --=20 2.26.2 From nobody Sun May 19 14:40:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603277449; cv=none; d=zohomail.com; s=zohoarc; b=A2M1L7Y9qAd5pRHa0whCq3aN019fFOCH1jcmUWWKl6dTsaUzlFVMeJ6MTU1O6UD1rzgPYz/Ch9zX9EMAH0CKc1pZurf+G/vIQHWqnRPElrVdw2AqlfbPEAAh7hHPPQxpz3V7Ry5vZZeqI1oIYCUTMo+bKH64pmxk0kWTn7rK37c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603277449; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TrWltPVKZu3fU5m7eJ+qSkFoeHPVQwlD70De7kBRthI=; b=SqH8jmGKlSZ8THejCjad6v2u/nQYeBVbNvV2cqBAc+3ohmKYNcwq0VChr7YZ8B1gZ9c+nfFggoa65a9ar5mIDrrDUnQ8z9ht/LV8yLCTXw3PHbnph4Ec/HJIcv5TjQPoK5KpBqalrF8/U/4YfBcZgd56fou8Ht7AOK+uVQ5FBys= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 160327744919112.549151794993804; Wed, 21 Oct 2020 03:50:49 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id i1so2606449wro.1 for ; Wed, 21 Oct 2020 03:50:48 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id e12sm2798621wme.32.2020.10.21.03.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 03:50:47 -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=TrWltPVKZu3fU5m7eJ+qSkFoeHPVQwlD70De7kBRthI=; b=Jxw3uhmzxtmX/xDddqhba3465aOVohWrpqzkJxfq5XIrMGrJ2rM6ZdGHy6jd+SViE+ kO5NYcQT2rIo/20h9eiSPsOI69HnqklJhSdK8KG0ueFHyo/a+eiBfDMTnBeoyDVnWzfI DqmNdGyM2Aj16Rf5kYuBovHeuwNPtjzummX15RZDlsr3ndnXTr3HV+Q8pB7QHhTFvmVo ijfGrPt628m71PlzceDW3OGixe0q1KP8jij/ojo/yu/OpJIgvOm2OL79MrLUx/3/Gub2 0KSYwl/LPECeudDCErKqe2T0zDeEdPcHwKHMamCPWYTCKaVmNiH2/I19njtB25ST6N2o pveg== 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=TrWltPVKZu3fU5m7eJ+qSkFoeHPVQwlD70De7kBRthI=; b=YAmBY+hLFLGNRawaL4g4PVVo5agw9vQ8Yh8dec7zT2wFJhi5wyNrwVciCdWkJNn55m guYZDdxNatF9eUQj0ZJvSUb85RLWtN4GNY+KThhfbK/FQvCddSuPMRVVnofu2DEq6Eyj uEvNMC3dN4XcdqCEb/mxaT+/rZMSLPLeBnwvCRSaOcF6cFhA65Ens9oPqadecp1PTVco xahUCPycCVqobj8LOaF5Y4koQNEawqfui0c0kwiw845R/vKwaA0XbapTzhr3pnbWdtoB CLKr4t2lAKeoAVg44v2c2Kv5eADGn55wc7x3/EpODmc/VoNoIR1z4bfb6Np/z9W9kKRs aYLA== X-Gm-Message-State: AOAM533fUBtQiCnQPZFJv4Z41oByGeW1fZav5N1DqsWkC31pAITZKjgA +UJPZ4xz0qG7euLoBtrcPmU= X-Google-Smtp-Source: ABdhPJxZLPxY0g4osL9oBzgd18iCn7IwfEu0pBwR2z1+TpCiKBdhjKLPLs4Ac0GdiyJzni01fnRqcg== X-Received: by 2002:adf:dd46:: with SMTP id u6mr4008117wrm.295.1603277447789; Wed, 21 Oct 2020 03:50:47 -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: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Thomas Huth , Wainer dos Santos Moschetta , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mark Cave-Ayland , Cleber Rosa Subject: [PATCH 2/6] tests/acceptance: Use .ppm extention for Portable PixMap files Date: Wed, 21 Oct 2020 12:50:31 +0200 Message-Id: <20201021105035.2477784-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021105035.2477784-1-f4bug@amsat.org> References: <20201021105035.2477784-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) The HMP 'screendump' command generates Portable PixMap files. Make it obvious by using the .ppm file extention. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- tests/acceptance/machine_m68k_nextcube.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py index 9d289f2fab7..2baba5fdc26 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -69,7 +69,7 @@ def check_bootrom_framebuffer(self, screenshot_path): =20 @skipUnless(PIL_AVAILABLE, 'Python PIL not installed') def test_bootrom_framebuffer_size(self): - screenshot_path =3D os.path.join(self.workdir, "dump.png") + screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) =20 width, height =3D Image.open(screenshot_path).size @@ -78,7 +78,7 @@ def test_bootrom_framebuffer_size(self): =20 @skipUnless(tesseract_available(3), 'tesseract v3 OCR tool not availab= le') def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): - screenshot_path =3D os.path.join(self.workdir, "dump.png") + screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) =20 console_logger =3D logging.getLogger('console') @@ -94,7 +94,7 @@ def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): # 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): - screenshot_path =3D os.path.join(self.workdir, "dump.png") + screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) =20 console_logger =3D logging.getLogger('console') --=20 2.26.2 From nobody Sun May 19 14:40:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603277454; cv=none; d=zohomail.com; s=zohoarc; b=C9i2SvyUq8oG/wk14j3oGr+shezuwaSRHD9GCYPoGAsMVeim1K90pYYvDhzh3Q4080/hvmOZUh4+Oeq6Emd3gyamGY4XQCvRWy05g/nMZcAfw5rLIkZ0gkjCkKMsLcW+M2lP1yCOeU2Pq88/ZBRNF1YZ/3UYXJc/OuC3jpLH8ZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603277454; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HDkuFBTSf9PfxMFUSQsII/3TQvG3KWBBsCKA4dEtXq0=; b=IfGDAHs1r6pwOj/7BwkWyw/FnPKlQjNjUOs1n6j8XQVkw2l35P4hosWWDyZchkRD4zsBvwdrd84yCf+z40ktLOEdwDpROpD+D3qLmGdzamUPUV+/IxoWX6XIoWMsRbD6wJwYYdzgCtq8cRkoF8H87ZbGFbilgkOwNYpr9p1lk5A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 160327745399716.743534475690808; Wed, 21 Oct 2020 03:50:53 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id d78so1374352wmd.3 for ; Wed, 21 Oct 2020 03:50:53 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id x65sm3079700wmg.1.2020.10.21.03.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 03:50:51 -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=HDkuFBTSf9PfxMFUSQsII/3TQvG3KWBBsCKA4dEtXq0=; b=bK5GYPDt7cantE00Sw1249BE4KvqtYpbDr/Sxxt37k1cYqjeoedUB9/p/VtP/1D/KI m3E0hXW/+KVxc2P/tN97AlUpI6+1yTl8tLlF9+yOQQcisHdqhqAdi6QM4BVVaZixINIp jwTtaBGqKy970mkL+1ibPoNXAesw2opNEyqpazTtjET4JHgAFRViNRlyuP9nFbkz7Wik u7twqUTVs834DOPVD2MA5034WsZCG7105beHpA0ROkiIDfEVKBObR7kMTZTYPaE2W6Us uq/S1s+0Haoi+7YiCj9gOzI9Pt8ZAt7eewDcy6hdbiSb9QpLraHRSCcMw81493gXcZr/ 8DuA== 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=HDkuFBTSf9PfxMFUSQsII/3TQvG3KWBBsCKA4dEtXq0=; b=o/2nWgiXHviPEJX2kzo1Iv5ih5lL0vZw81L4TYY0K06Pzhtr6oIpkx/CluNpQXFwZY 0mmSduYklbQtCXfx8NChpgNOWw0sUvnlD2G90RhD0GDy/Vl4sHaya3Wb/oickae2OTag QZtxC3IaOgPakhE0yT1SHb9pWZXvheLSjj7u9jGaP6FBxU9Vslt8tSDF0OJXFLKzvsUm +qPfswh6eSdd6zYx6oDHuqwz0R1IRtxoRw+CEnPH8LZ9Q7RmcKWL7xe/jSkKd1Nh5AJt oEYTdHLfuNvqydmQDvD7GxbLlaDH4EXMkQ9oc2KQf9nHbXh3fvMU+Jonf1rXBdEp0A3p HwXw== X-Gm-Message-State: AOAM533DqoOQftL7tegOLRyW91jsiOQUStOpLZl0/t+RG/9ByNtd5GAR ZHvMJE6REKxzTcjn2RDTiDg= X-Google-Smtp-Source: ABdhPJx5HxH9RBzULE6fqH/E7B8THu1Q/w0fZwryntr0toSwRMSG3bwXy1kqIBv6rjpDEHop8wuKjg== X-Received: by 2002:a1c:4856:: with SMTP id v83mr2948606wma.118.1603277452507; Wed, 21 Oct 2020 03:50:52 -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: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Thomas Huth , Wainer dos Santos Moschetta , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mark Cave-Ayland , Cleber Rosa Subject: [PATCH 3/6] tests/acceptance: Extract tesseract_available() helper in new namespace Date: Wed, 21 Oct 2020 12:50:32 +0200 Message-Id: <20201021105035.2477784-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021105035.2477784-1-f4bug@amsat.org> References: <20201021105035.2477784-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) We are going to reuse tesseract_available(). Extract it to a new 'tesseract_utils' namespace. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- tests/acceptance/machine_m68k_nextcube.py | 25 +++----------------- tests/acceptance/tesseract_utils.py | 28 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 tests/acceptance/tesseract_utils.py diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py index 2baba5fdc26..3c7400c43e4 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -1,19 +1,19 @@ # Functional test that boots a VM and run OCR on the framebuffer # -# Copyright (c) Philippe Mathieu-Daud=C3=A9 +# 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. =20 import os -import re import time import logging =20 from avocado_qemu import Test from avocado import skipUnless from avocado.utils import process -from avocado.utils.path import find_command, CmdNotFoundError + +from tesseract_utils import tesseract_available =20 PIL_AVAILABLE =3D True try: @@ -22,25 +22,6 @@ PIL_AVAILABLE =3D False =20 =20 -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): """ :avocado: tags=3Darch:m68k diff --git a/tests/acceptance/tesseract_utils.py b/tests/acceptance/tessera= ct_utils.py new file mode 100644 index 00000000000..acd6e8c2faa --- /dev/null +++ b/tests/acceptance/tesseract_utils.py @@ -0,0 +1,28 @@ +# ... +# +# 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 + +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=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 --=20 2.26.2 From nobody Sun May 19 14:40:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603277458; cv=none; d=zohomail.com; s=zohoarc; b=QpCgT+MfUa/5jZxEdXDqjMO2VsScmqKcEFH43Czjrlp+hwzAv7u5r2OqVuHqvu1U/hNIhrKLo34ga98FBhpub+OSeFHx6XneDj+ZSogtitMRM6w8bdVPSQ5dsxYecj8SLDWSXLFDybCtpruFvg6M8ENuCpe5GYygprl0CMcwayA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603277458; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u8MIW0fZuo8s+yk9Tsr3op5QbGANqrFw34tCgPBF3cw=; b=Fu/CT5U/jGPeBiVD1HtrN2r+QMOM9b6IvHeH2Zn/4skjvMxL3ngVklXhbGnYmKFsN4G/2GfqWfofYxvLXNkCnrXff8lLTIYaVc3sC3a3SPDBdk1ic1EGKFVD0FUyMIgWmmUBuT8WD2pzcuCCBi1J1f02014NKbjaabCwFbBJsF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1603277458795750.1302185672854; Wed, 21 Oct 2020 03:50:58 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id 13so1377867wmf.0 for ; Wed, 21 Oct 2020 03:50:58 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id z6sm2781092wmi.28.2020.10.21.03.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 03:50:56 -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=u8MIW0fZuo8s+yk9Tsr3op5QbGANqrFw34tCgPBF3cw=; b=fSoX3I/r74xELcpRZ3OdZaYY+ZfCUTskrMBMgjWVe4FbwR/txGkVTyawTWQQ+vHKNE sBU0L5sSs0pfSJ70pK4frMRhldqv2Z7tXM9WPaoM+mz/tfY6bcD0m1nVIq+YHckx1gNJ FP8Tzo8xvRYGx29Ih/bbYAsCTYvE5YGeFOzhaa0kSZjskFdcCmcsWKn32Z/X6jYIMhSc WTsXhgxyKPJkLsoL3Px3FdmLCeV8+DsyGvq0S/0DTEr0H6b6cvzq+mR4YMuUWDvxrwg5 5zEFwzEe4fiVCPkJPtEilvh2QOIx9tKo51DZ7BB04JQyyxSsqw4GoT+qAN2qPs7qWOoz 6LBQ== 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=u8MIW0fZuo8s+yk9Tsr3op5QbGANqrFw34tCgPBF3cw=; b=nzCByT3Ys/ibvtloOBendeGG+GMB9T2r7oXP/IQqfr/KAkyGklbNAbOGNNycc7gluT sYUzX5kargV/MSzFAFJK1uBquHmFLx9v0NMpDN++SPbfYC/BQ7afV2O3PSeJqpLViB5L 2OX9+pe8P9EWsrGLBNB4rp1SnmYftYGCpPprWMHnca91PqO+3XAWFQ+gxH+S6f/vMF54 rc7qUWB6/k8+6/8IOZOnFDYTf/fYBh+Hi9kviD3NqkrAsTgD7A5nosxMoJJYOe3Cmi46 Sed3jKxmg/5hwvGLLmFupkPCHXdMCQKWVtMrP+Uau0ZSmaAZE2NP7mJXv20cq/5CmQDi hH4g== X-Gm-Message-State: AOAM531GrTKP0TB9SgugmMvZT/zfByv+xR7dWHEcsmsRLcsadwP1m4kA r6+40JyvKe2RIzY/zHF/Q5M= X-Google-Smtp-Source: ABdhPJw4WuLXr4fMv1GVowlFCqxkzdgn0xn2wi9PmCKKIJ7Wo0gIYde7vbK77YJLUEIvrk8XzROSRA== X-Received: by 2002:a7b:cb81:: with SMTP id m1mr3065574wmi.140.1603277457309; Wed, 21 Oct 2020 03:50:57 -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: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Thomas Huth , Wainer dos Santos Moschetta , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mark Cave-Ayland , Cleber Rosa Subject: [PATCH 4/6] tests/acceptance: Introduce tesseract_ocr() helper Date: Wed, 21 Oct 2020 12:50:33 +0200 Message-Id: <20201021105035.2477784-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021105035.2477784-1-f4bug@amsat.org> References: <20201021105035.2477784-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) We are going to reuse the tesseract OCR code. Create a new tesseract_ocr() helper and use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/machine_m68k_nextcube.py | 21 +++++---------------- tests/acceptance/tesseract_utils.py | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/m= achine_m68k_nextcube.py index 3c7400c43e4..09e2745cc52 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -7,13 +7,11 @@ =20 import os import time -import logging =20 from avocado_qemu import Test from avocado import skipUnless -from avocado.utils import process =20 -from tesseract_utils import tesseract_available +from tesseract_utils import tesseract_available, tesseract_ocr =20 PIL_AVAILABLE =3D True try: @@ -61,12 +59,8 @@ def test_bootrom_framebuffer_size(self): def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): screenshot_path =3D os.path.join(self.workdir, "dump.ppm") 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) + lines =3D tesseract_ocr(screenshot_path, tesseract_version=3D3) + text =3D '\n'.join(lines) self.assertIn('Backplane', text) self.assertIn('Ethernet address', text) =20 @@ -77,13 +71,8 @@ def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): def test_bootrom_framebuffer_ocr_with_tesseract_v4(self): screenshot_path =3D os.path.join(self.workdir, "dump.ppm") 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) + lines =3D tesseract_ocr(screenshot_path, tesseract_version=3D4) + text =3D '\n'.join(lines) self.assertIn('Testing the FPU, SCC', text) self.assertIn('System test failed. Error code', text) self.assertIn('Boot command', text) diff --git a/tests/acceptance/tesseract_utils.py b/tests/acceptance/tessera= ct_utils.py index acd6e8c2faa..72cd9ab7989 100644 --- a/tests/acceptance/tesseract_utils.py +++ b/tests/acceptance/tesseract_utils.py @@ -6,7 +6,9 @@ # later. See the COPYING file in the top-level directory. =20 import re +import logging =20 +from avocado.utils import process from avocado.utils.path import find_command, CmdNotFoundError =20 def tesseract_available(expected_version): @@ -26,3 +28,19 @@ def tesseract_available(expected_version): return False # now this is guaranteed to be a digit return int(match.groups()[0]) =3D=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 --=20 2.26.2 From nobody Sun May 19 14:40:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603277463; cv=none; d=zohomail.com; s=zohoarc; b=GxhctRE/wbjqmCoDn3Ajm23YwG7lGeAaJzPeGmUOVS5fqEFhY0rq6EDCeGY1gSTde2qibVpv8OXMp9KAqocMzOxAAa2rLFvpwQdSc9BoEBrvTWVqL+FHIm5hGg0DBMKdWSA/FURR6hXyEIjMQhnK7GLgNgWmJBJv3nPQq8baXQQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603277463; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=quiicLeYyNWtIdMVLHoYPSS0nbnwlfIHdSBUJ8b+yp4=; b=biubF82tef49UuMKnJYm8+kG6Q4aAi1keEE0nPmAp03LJjg4xnHULY5IxKbjht1cp1UeyjiWN2ZTe4ttFVRZu7o63rMqb1HQfm54TzMf7sJ3oTU8OL7qldmZ/DT6sVUQLf3jXvalD8j5hae70cQ5ZJN0ZKR+sezZ4tSnY18m5Kk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 1603277463544812.7704994748135; Wed, 21 Oct 2020 03:51:03 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id g12so2460036wrp.10 for ; Wed, 21 Oct 2020 03:51:03 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id s19sm7710935wmc.0.2020.10.21.03.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 03:51: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=quiicLeYyNWtIdMVLHoYPSS0nbnwlfIHdSBUJ8b+yp4=; b=KUM04qTDjwucoELmfnRqT+UP9GYd3ajKwUohOneavzzC9KKV6mPzv3kzuC7UWPArk3 e7+AsLP0PkjLKdxLHXEbtlHEwiWA0XInHvo31rm7afddWyNvT6pY8vVKbHt39aDp5rkm lLNp920aRYaQ7CQ80Nk0zGAbjKM0zq/scOdTpLEds//deJXhip7evbXwZw9kb2rlLTv5 486m5ueE+TBSdT80MU9MSpVXV8LE3vyusW7xqNYshY1pIp4htucztZMjqSlAolwVipTj DemWtYOJxEsp+J4GB4aFaEm/TUwt5ZzPgmhaMdiPHFQKTViJb0N5bjE6ynJEOhl12jBW iFNQ== 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=quiicLeYyNWtIdMVLHoYPSS0nbnwlfIHdSBUJ8b+yp4=; b=RmPUfFfzTwqDfc/5XYucXcZlca61AdB7Qyw76umfDFIKTTPDG/JSdTIjD+pWsnB5dx MD14ajLY4p6pft9iDlAcP6CHDXnanKXjFwjmiZgNrl+qSm633ynX2XsMG2Rwh4PjDVW7 ndyDi7ixj7FT8EQnyu559/MTxXDXBrrMIAXfQFzD7RQs8stwnjx/QKm6Tg/VXRtrSMsI aaPjFQMiDbuzYZ38kb8JgElkDhPiSOU79GLtkQRM7DaB2RhJUrTpeFNVN2f4H0Zyoxy/ zMVPtMiE5+7Mu/bMVJFLlxM906tqSfrnFM/zAnlbqkcWvMrBC7hF0Bd1GFK/FP/oEbb2 k5FA== X-Gm-Message-State: AOAM531a3GudMUICQKhruL92mqnRyPZtcQ9YzeawlRv2NFqI8Ay1kAB7 QmWA4kid0IZrkCFGZ8fuSfA= X-Google-Smtp-Source: ABdhPJzeIBwrr+pkrOwqouBDUhBndtvACFR+6D611LA0RySwBS85XEQ1/cv/jWswj/Y9oj6kcXqJfw== X-Received: by 2002:adf:ed07:: with SMTP id a7mr4135266wro.326.1603277462131; Wed, 21 Oct 2020 03:51: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: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Thomas Huth , Wainer dos Santos Moschetta , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mark Cave-Ayland , Cleber Rosa Subject: [PATCH 5/6] tests/acceptance: Test Linux on the Fuloong 2E machine Date: Wed, 21 Oct 2020 12:50:34 +0200 Message-Id: <20201021105035.2477784-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021105035.2477784-1-f4bug@amsat.org> References: <20201021105035.2477784-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) Trivial test booting the rescue image provided by Lemote: $ AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 \ avocado --show=3Dapp,console run tests/acceptance/machine_mips_fuloong2= e.py Fetching asset from tests/acceptance/machine_mips_fuloong2e.py:MipsFuloon= g2e.test_linux_kernel_isa_serial (1/1) tests/acceptance/machine_mips_fuloong2e.py:MipsFuloong2e.test_linu= x_kernel_isa_serial: console: Linux version 2.6.27.7lemote (root@debian) (gcc version 4.1.3 20= 080623 (prerelease) (Debian 4.1.2-23)) #6 Fri Dec 12 00:11:25 CST 2008 console: busclock=3D33000000, cpuclock=3D-2145008360,memsize=3D256,highme= msize=3D0 console: console [early0] enabled console: CPU revision is: 00006302 (ICT Loongson-2) PASS (0.16 s) JOB TIME : 0.51 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + tests/acceptance/machine_mips_fuloong2e.py | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 tests/acceptance/machine_mips_fuloong2e.py diff --git a/MAINTAINERS b/MAINTAINERS index a7f0acf8663..1720a383e6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1152,6 +1152,7 @@ F: hw/mips/fuloong2e.c F: hw/isa/vt82c686.c F: hw/pci-host/bonito.c F: include/hw/isa/vt82c686.h +F: tests/acceptance/machine_mips_fuloong2e.py =20 Loongson-3 virtual platforms M: Huacai Chen diff --git a/tests/acceptance/machine_mips_fuloong2e.py b/tests/acceptance/= machine_mips_fuloong2e.py new file mode 100644 index 00000000000..5fd3da09e7c --- /dev/null +++ b/tests/acceptance/machine_mips_fuloong2e.py @@ -0,0 +1,42 @@ +# Functional tests for the Lemote Fuloong-2E machine. +# +# 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. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os + +from avocado import skipUnless +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern + +class MipsFuloong2e(Test): + + timeout =3D 60 + + @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code= ') + def test_linux_kernel_isa_serial(self): + """ + :avocado: tags=3Darch:mips64el + :avocado: tags=3Dmachine:fulong2e + :avocado: tags=3Dendian:little + :avocado: tags=3Ddevice:bonito64 + :avocado: tags=3Ddevice:via686b + """ + # Recovery system for the Yeeloong laptop + # (enough to test the fuloong2e southbridge, accessing its ISA bus) + # http://dev.lemote.com/files/resource/download/rescue/rescue-yl + kernel_url =3D ('https://github.com/philmd/qemu-testing-blob/' + 'raw/f6b2e7e4/mips/yeeloong/mips64el/rescue-yl') + kernel_hash =3D 'ec4d1bd89a8439c41033ca63db60160cc6d6f09a' + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) + + self.vm.set_console() + self.vm.add_args('-kernel', kernel_path) + self.vm.launch() + wait_for_console_pattern(self, 'Linux version 2.6.27.7lemote') + cpu_revision =3D 'CPU revision is: 00006302 (ICT Loongson-2)' + wait_for_console_pattern(self, cpu_revision) --=20 2.26.2 From nobody Sun May 19 14:40:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603277468; cv=none; d=zohomail.com; s=zohoarc; b=TOWzjLbHe5rwK4ZkFb6x8uEnPjQbyq5LdHR6mHxpkrFgQtXdlW99FRhbDSQDM0cuza5sdJ9+eTdFrCUwHEqoR3E2V+A/g6kPueNEAaAuy9/B/SRhmdBj7fdocm4bEN4+YRmmryOpG+YFnxmw8L1O9eaMcMchFNSGT4E54OHY2Yg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603277468; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sya+QU41wlcVkPizrwatYGHt9fWrCDbWxbNEti7h2ho=; b=Hj7O+rEaSbwc1rTHdbMoWTgVm3XfCBuJKhrnuLT9d267tcGZ96UlYiwUbNcjjJFko56g+hebpK7H8EimIk/XIpb65YqJ2pu/teIfcY6sVLXew4dBCslqDFy9T6PvnVRFnIcIs50d5wWdMYgek3N83oJj+mD4FQ7CNqRJ4HEDh40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1603277468405124.73872767504884; Wed, 21 Oct 2020 03:51:08 -0700 (PDT) Received: by mail-wm1-f65.google.com with SMTP id c16so1603020wmd.2 for ; Wed, 21 Oct 2020 03:51:07 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id 24sm2665954wmf.44.2020.10.21.03.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 03:51: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=sya+QU41wlcVkPizrwatYGHt9fWrCDbWxbNEti7h2ho=; b=jMgHwLzRVp9leEB8s/kEGer0DyfE+AbxVEirZvYHl2E/yUqRez5R1+pmLEBZ3arsRr jHY62SfoDw+oRGI2VUqJUGxzQtP006ckJwhWEm7UPa22YurI9YAeWoTQcQsgg2NhPMT7 Dcslv7tBd+92iEseNfmLn+hH5m5y8dV3pzZBD2YYW5YfBUIUKifJEuhewhfIA0X98oin n+dCZPQVl4IqbCHTTRhNtIbxuxmrnzVVomCjEybPq/Fr0IR53ftznA8Ld1wnNKlCh96t ftDCroshCCoAPRWGXC4Ha0s/uv6sdL+wPdoeOQxq4n4w2Dhv6RPvxyDtoiB295/Un16i cGxg== 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=sya+QU41wlcVkPizrwatYGHt9fWrCDbWxbNEti7h2ho=; b=Lpoei6HgilK5cMrAJh6lrzRx3tCJZQvTNxeU11BV9HsI1dBd7knF8gwQ3VJIvoFqMX K+nTAMy7ysvcj2lcgYz1vg7ZBm1BrTkTguC8ohkuA1QvYLsaTz5PgeocGyUCxZdCtz6W ySTkV5ZEFYfHk3La92xTq5Z5uLx/bqsPUReiuxBkDeaC2w1bhliqCohHxb/vQ9B8rEM4 43omwfMfIcDzoWcJGV4SHDKorAdSqk43elTjuwBq+BacM9RqVL0WjU62DvOmTHIeOFh+ dA1g8UOwKq5dEjmo7BgGipjNbd43Cm6U5UNdCD+m5h9ETt8k1QW/0p94RhrkOpkNzv9R yq6A== X-Gm-Message-State: AOAM530KhtDQYM63xNbg4L/g4uqA8ucez8+g8TicFhBdQ5M9WwdgZ08o C0ncbIJh4fGPHJzAomamUvU= X-Google-Smtp-Source: ABdhPJzJycn5B1g7AsDVMp+34eLhwlUyclsIsr3EJMP7HBqA9/0L63lah8aQln9vPACzCp9XGHGK0g== X-Received: by 2002:a1c:e154:: with SMTP id y81mr2918494wmg.111.1603277466924; Wed, 21 Oct 2020 03:51: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: Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Thomas Huth , Wainer dos Santos Moschetta , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mark Cave-Ayland , Cleber Rosa Subject: [PATCH 6/6] tests/acceptance: Test PMON on the Fuloong 2E machine Date: Wed, 21 Oct 2020 12:50:35 +0200 Message-Id: <20201021105035.2477784-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021105035.2477784-1-f4bug@amsat.org> References: <20201021105035.2477784-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) Test the PMON firmware. As the firmware is not redistributable, it has to be downloaded manually first. Then it can be used by providing its path via the PMON_BIN_PATH environment variable: $ PMON_BIN_PATH=3D~/images/fuloong2e/pmon_2e.bin \ AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 \ avocado --show=3Dapp,console run tests/acceptance/machine_mips_fuloong2= e.py Fetching asset from tests/acceptance/machine_mips_fuloong2e.py:MipsFuloon= g2e.test_linux_kernel_isa_serial (1/3) tests/acceptance/machine_mips_fuloong2e.py:MipsFuloong2e.test_pmon= _serial_console: console: PMON2000 MIPS Initializing. Standby... console: ERRORPC=3D00000000 CONFIG=3D00030932 console: PRID=3D00006302 console: Init SDRAM Done! console: Sizing caches... console: Init caches... console: godson2 caches found console: Init caches done, cfg =3D 00030932 console: Copy PMON to execute location... console: copy text section done. console: Copy PMON to execute location done. Uncompressing Bios........................OK,Booting Bios PASS (0.25 s) (2/3) tests/acceptance/machine_mips_fuloong2e.py:MipsFuloong2e.test_pmon= _framebuffer_console: [...] Uncompressing Bios........................OK,Booting Bios console: FREQ console: FREI console: DONE console: TTYI console: TTYD console: ENVI console: MAPV console: Mfg 0, Id 60 console: STDV console: SBDD console: PPCIH console: PCIS console: PCIR console: PCIW console: NETI console: RTCL console: PCID console: VGAI console: Default MODE_ID 2 console: starting radeon init... console: radeon init done console: FRBI console: cfb_console init,fb=3Db4000000 console: Video: Drawing the logo ... console: CONSOLE_SIZE 450560HSTI PASS (4.10 s) (3/3) tests/acceptance/machine_mips_fuloong2e.py:MipsFuloong2e.test_linu= x_kernel_isa_serial: console: Linux version 2.6.27.7lemote (root@debian) (gcc version 4.1.3 20= 080623 (prerelease) (Debian 4.1.2-23)) #6 Fri Dec 12 00:11:25 CST 2008 console: busclock=3D33000000, cpuclock=3D-2145008360,memsize=3D256,highme= msize=3D0 console: console [early0] enabled console: CPU revision is: 00006302 (ICT Loongson-2) PASS (0.19 s) RESULTS : PASS 3 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 5.10 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Huacai Chen Cc: Mark Cave-Ayland Cc: Daniel P. Berrange Cc: Alex Benn=C3=A9e --- tests/acceptance/machine_mips_fuloong2e.py | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tests/acceptance/machine_mips_fuloong2e.py b/tests/acceptance/= machine_mips_fuloong2e.py index 5fd3da09e7c..807e38da74a 100644 --- a/tests/acceptance/machine_mips_fuloong2e.py +++ b/tests/acceptance/machine_mips_fuloong2e.py @@ -8,15 +8,74 @@ # SPDX-License-Identifier: GPL-2.0-or-later =20 import os +import time =20 from avocado import skipUnless from avocado_qemu import Test from avocado_qemu import wait_for_console_pattern =20 +from tesseract_utils import tesseract_available, tesseract_ocr + class MipsFuloong2e(Test): =20 timeout =3D 60 =20 + @skipUnless(os.getenv('PMON_BIN_PATH'), 'PMON_BIN_PATH not available') + def test_pmon_serial_console(self): + """ + :avocado: tags=3Darch:mips64el + :avocado: tags=3Dmachine:fulong2e + :avocado: tags=3Dendian:little + :avocado: tags=3Ddevice:bonito64 + :avocado: tags=3Ddevice:via686b + """ + pmon_hash =3D 'c812e1695d7b2320036f3ef494976969' # v1.1.2 + pmon_path =3D self.fetch_asset('file://' + os.getenv('PMON_BIN_PAT= H'), + asset_hash=3Dpmon_hash, algorithm=3D'= md5') + + self.vm.set_console() + self.vm.add_args('-bios', pmon_path) + self.vm.launch() + wait_for_console_pattern(self, 'PMON2000 MIPS Initializing. Standb= y...') + wait_for_console_pattern(self, 'Booting Bios') + + # 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') + @skipUnless(os.getenv('PMON_BIN_PATH'), 'PMON_BIN_PATH not available') + def test_pmon_framebuffer_console(self): + """ + :avocado: tags=3Darch:mips64el + :avocado: tags=3Dmachine:fulong2e + :avocado: tags=3Dendian:little + :avocado: tags=3Ddevice:bonito64 + :avocado: tags=3Ddevice:ati-vga + """ + screenshot_path =3D os.path.join(self.workdir, 'dump.ppm') + + pmon_hash =3D 'c812e1695d7b2320036f3ef494976969' # v1.1.2 + pmon_path =3D self.fetch_asset('file://' + os.getenv('PMON_BIN_PAT= H'), + asset_hash=3Dpmon_hash, algorithm=3D'= md5') + + self.vm.set_console() + self.vm.add_args('-bios', pmon_path, + '-vga', 'std') + self.vm.launch() + + wait_for_console_pattern(self, 'Video: Drawing the logo ...') + self.log.info('VM launched, waiting for logo on display') + time.sleep(2) + wait_for_console_pattern(self, 'CONSOLE_SIZE') + self.vm.command('human-monitor-command', command_line=3D'stop') + self.vm.command('human-monitor-command', + command_line=3D'screendump %s' % screenshot_path) + + lines =3D tesseract_ocr(screenshot_path, tesseract_version=3D4, + tesseract_args=3D'--dpi 128') + pmon_version =3D 'PNON2000 for Loongson, Version 1.1.2' # PNON is = enough + self.assertIn(pmon_version, lines) + @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code= ') def test_linux_kernel_isa_serial(self): """ --=20 2.26.2