Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 444EFC433EF for ; Sat, 30 Apr 2022 07:00:03 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA5DA83F6B; Sat, 30 Apr 2022 08:59:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fjJtQeUM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B30381DCD; Sat, 30 Apr 2022 08:58:10 +0200 (CEST) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 78A3883F2D for ; Sat, 30 Apr 2022 08:58:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-wr1-x434.google.com with SMTP id d5so13307352wrb.6 for ; Fri, 29 Apr 2022 23:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0n5E56GKCfweujwwNuBXHuIq/hBgkzuRo/XZK/BMN2Q=; b=fjJtQeUMop6pylvb8AL+9tBDqMeIowVu4ZQ49MDeWw/SHoU43mgzYmjk++57s7u8hG 0Fj5uAWk8Te+uFS46ZnFgtDbZjTHuayX5LMMl350HSqaRmQOSBOyNnylfjxaf/vxb+DN nejM2m3J4XalEJjUgJ27sty6cJVQvUK//sq+g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0n5E56GKCfweujwwNuBXHuIq/hBgkzuRo/XZK/BMN2Q=; b=nz28PGWIytjOdgOJKqVf3xWrIUAHflcQrU7zlID/oG7b07lc3BvnljF65AcRUklXvF zuLrb1DDxYX5mKArMGaL4uqLAlXV7hRhUnNk9p4Zdlh90OyLZO9akZ4yCrlP+N/Nd0g2 Z4uXucVX0OwJeQIELNG9hhW9G3zqq+MSZxLyeZfMQSa7f3DX0jNiMvEeT3Zuq4nrxBdl spF/cuorbmGdwN0fHamI+pAD/n9Gz2/qJH9lexoE6QIwJATlUI26g7iIfjC45lV0BCsG v01oK5Ya4/Z7Z8WbyPFeauDMrSROG1DGi5vsQtShUjgYn8Sh0OiARJFWvNwgs3Cnj7NU RR4A== X-Gm-Message-State: AOAM533by7qiDeDP+KB4q8Oi7jAd4csfozwKu5x7r52ctt6r29gJF+w6 jfE3ESq276ha6Z7Az4qYJ/ps8hLoOKazYQ== X-Google-Smtp-Source: ABdhPJyli1dsY2+7jIkih9CZFxchQ5NG6iNlB8xPbaDtnSOG4gKcb8HBtZ5oWjcAuoWbP4vK0O/YYQ== X-Received: by 2002:adf:e7c1:0:b0:20a:b724:cedd with SMTP id e1-20020adfe7c1000000b0020ab724ceddmr2051926wrn.409.1651301882116; Fri, 29 Apr 2022 23:58:02 -0700 (PDT) Received: from sjg1.roam.corp.google.com (246.45-246-81.adsl-static.isp.belgacom.be. [81.246.45.246]) by smtp.gmail.com with ESMTPSA id r11-20020adfa14b000000b0020c5253d927sm1231553wrr.115.2022.04.29.23.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 23:58:01 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v8 11/13] vpl: Support running vpl tests Date: Sat, 30 Apr 2022 00:56:55 -0600 Message-Id: <20220430065657.310388-2-sjg@chromium.org> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog In-Reply-To: <20220430065657.310388-1-sjg@chromium.org> References: <20220430065657.310388-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Add support for these to the pytest system. Signed-off-by: Simon Glass --- Changes in v8: - Add new patch to support running vpl tests test/py/conftest.py | 7 +++++-- test/py/tests/test_vpl.py | 34 +++++++++++++++++++++++++++++++ test/py/u_boot_console_sandbox.py | 7 ++++++- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 test/py/tests/test_vpl.py diff --git a/test/py/conftest.py b/test/py/conftest.py index 16e445cd8ee..2ba34479e03 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -322,8 +322,11 @@ def pytest_generate_tests(metafunc): if fn == 'ut_subtest': generate_ut_subtest(metafunc, fn, '/u-boot.sym') continue - if fn == 'ut_spl_subtest': - generate_ut_subtest(metafunc, fn, '/spl/u-boot-spl.sym') + m_subtest = re.match('ut_(.)pl_subtest', fn) + if m_subtest: + spl_name = m_subtest.group(1) + generate_ut_subtest( + metafunc, fn, f'/{spl_name}pl/u-boot-{spl_name}pl.sym') continue generate_config(metafunc, fn) diff --git a/test/py/tests/test_vpl.py b/test/py/tests/test_vpl.py new file mode 100644 index 00000000000..4af578b9173 --- /dev/null +++ b/test/py/tests/test_vpl.py @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2022 Google LLC +# Written by Simon Glass + +import os.path +import pytest + +def test_vpl(u_boot_console, ut_vpl_subtest): + """Execute a "ut" subtest. + + The subtests are collected in function generate_ut_subtest() from linker + generated lists by applying a regular expression to the lines of file + vpl/u-boot-vpl.sym. The list entries are created using the C macro + UNIT_TEST(). + + Strict naming conventions have to be followed to match the regular + expression. Use UNIT_TEST(foo_test_bar, _flags, foo_test) for a test bar in + test suite foo that can be executed via command 'ut foo bar' and is + implemented in C function foo_test_bar(). + + Args: + u_boot_console (ConsoleBase): U-Boot console + ut_subtest (str): VPL test to be executed (e.g. 'dm platdata_phandle') + """ + try: + cons = u_boot_console + cons.restart_uboot_with_flags(['-u', '-k', ut_vpl_subtest.split()[1]]) + output = cons.get_spawn_output().replace('\r', '') + assert 'Failures: 0' in output + finally: + # Restart afterward in case a non-VPL test is run next. This should not + # happen since VPL tests are run in their own invocation of test.py, but + # the cost of doing this is not too great at present. + u_boot_console.restart_uboot() diff --git a/test/py/u_boot_console_sandbox.py b/test/py/u_boot_console_sandbox.py index b79ec817957..27c6db8d719 100644 --- a/test/py/u_boot_console_sandbox.py +++ b/test/py/u_boot_console_sandbox.py @@ -44,7 +44,12 @@ class ConsoleSandbox(ConsoleBase): bcfg = self.config.buildconfig config_spl = bcfg.get('config_spl', 'n') == 'y' - fname = '/spl/u-boot-spl' if config_spl else '/u-boot' + config_vpl = bcfg.get('config_vpl', 'n') == 'y' + if config_vpl: + # Run TPL first, which runs VPL + fname = '/tpl/u-boot-tpl' + else: + fname = '/spl/u-boot-spl' if config_spl else '/u-boot' print(fname) cmd = [] if self.config.gdbserver: -- 2.36.0.464.gb9c8b46e94-goog