From patchwork Sat Oct 3 15:25:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1376293 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=HXHTnPEk; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C3W4R4V3pz9s1t for ; Sun, 4 Oct 2020 01:29:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E367823F5; Sat, 3 Oct 2020 17:26:21 +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="HXHTnPEk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D581823B3; Sat, 3 Oct 2020 17:26:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 7666D8237C for ; Sat, 3 Oct 2020 17:26:10 +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-io1-xd34.google.com with SMTP id u6so4672839iow.9 for ; Sat, 03 Oct 2020 08:26:10 -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=y7zCXtZhMBvcucpPpL5y+c/o02F9tgTlIkAIjIx/bkg=; b=HXHTnPEk1i0ueOApC9srxcXtqUO+WbTyRIDmDyVTNwJS6jsU8G3uen+p5D+zvN65oZ FHKxh+duBn1PEnKi9ZB63hU8JjcBvxriJJt8LunCfkbqGvyfsd6Xvd1U6t7vK6sXIGpf e/tOI3KN8z4oWbVLOXLvtii+/L/sxU/yrgCro= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y7zCXtZhMBvcucpPpL5y+c/o02F9tgTlIkAIjIx/bkg=; b=Zti6wEzFxY8F+s9wzxyO/ivDm7adFTH8XecCRgeLyh93OW8UNNq55W5VfDlEImhTyp RJeaHJsKesbRdo2dUY4bpVhg2JH4F8FqYS1lBR3bjWcsimoZi5ozgVgraA97N1ZPSoP4 mn283+abjf7/N1D1xZp4hLTCWX23rCSqY9do5lpF2XIaeEpaqIgaldlAcUvNS5EN4CnF dW/0EwkR894P+I/itNA3hyuK1FlV+DR0wF8h7BzPcVPTFKMzar+q0TgqFZ403mC1F2hk J5x1/MLc0ecYlTAAUzB6FQDd/xbFvjtw9TNzkvtxtdnoCGj3Z21m0LN375OQWARneoUZ KfxQ== X-Gm-Message-State: AOAM533ddlbKsxVB5QSPPtKXV6SzdeBBPhtrQkJFpJZc85xvU77shOtP oGQGX+CuVD1eBD2s+yFyRLXublMhoKKnTIIE X-Google-Smtp-Source: ABdhPJxoYiBWd3ltSix+PR4qsUf9O+Znzky204YK78NZHoF2fcUWkJlcYC3kbJ55ATdpp14SeBsRhQ== X-Received: by 2002:a05:6602:189:: with SMTP id m9mr5639706ioo.74.1601738769173; Sat, 03 Oct 2020 08:26:09 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id l77sm2099558ill.4.2020.10.03.08.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 08:26:08 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Cristian Ciocaltea , Heinrich Schuchardt , Marek Vasut , Stephen Warren Subject: [PATCH 15/17] pytest: Collect SPL unit tests Date: Sat, 3 Oct 2020 09:25:32 -0600 Message-Id: <20201003152534.3184504-16-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.806.g8561365e88-goog In-Reply-To: <20201003152534.3184504-1-sjg@chromium.org> References: <20201003152534.3184504-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Add a new test_spl fixture to handle running SPL unit tests. Signed-off-by: Simon Glass --- test/py/conftest.py | 14 +++++++++----- test/py/tests/test_spl.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 test/py/tests/test_spl.py diff --git a/test/py/conftest.py b/test/py/conftest.py index 30920474b36..28fde347c00 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -227,7 +227,7 @@ def pytest_configure(config): console = u_boot_console_exec_attach.ConsoleExecAttach(log, ubconfig) re_ut_test_list = re.compile(r'_u_boot_list_2_(.*)_test_2_\1_test_(.*)\s*$') -def generate_ut_subtest(metafunc, fixture_name): +def generate_ut_subtest(metafunc, fixture_name, sym_path): """Provide parametrization for a ut_subtest fixture. Determines the set of unit tests built into a U-Boot binary by parsing the @@ -237,12 +237,13 @@ def generate_ut_subtest(metafunc, fixture_name): Args: metafunc: The pytest test function. fixture_name: The fixture name to test. + sym_path: Relative path to the symbol file with preceding '/' + (e.g. '/u-boot.sym') Returns: Nothing. """ - - fn = console.config.build_dir + '/u-boot.sym' + fn = console.config.build_dir + sym_path try: with open(fn, 'rt') as f: lines = f.readlines() @@ -317,10 +318,13 @@ def pytest_generate_tests(metafunc): Returns: Nothing. """ - + #print('name', metafunc.fixturenames) for fn in metafunc.fixturenames: if fn == 'ut_subtest': - generate_ut_subtest(metafunc, fn) + generate_ut_subtest(metafunc, fn, '/u-boot.sym') + continue + if fn == 'ut_spl_subtest': + generate_ut_subtest(metafunc, fn, '/spl/u-boot-spl.sym') continue generate_config(metafunc, fn) diff --git a/test/py/tests/test_spl.py b/test/py/tests/test_spl.py new file mode 100644 index 00000000000..58a851e5ec8 --- /dev/null +++ b/test/py/tests/test_spl.py @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2020 Google LLC +# Written by Simon Glass + +import os.path +import pytest + +def test_spl(u_boot_console, ut_spl_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 + spl/u-boot-spl.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): test to be executed via command ut, e.g 'foo bar' to + execute command 'ut foo bar' + """ + cons = u_boot_console + cons.restart_uboot_with_flags(['-u', ut_spl_subtest]) + output = cons.get_spawn_output().replace('\r', '') + assert 'Failures: 0' in output