Message ID | 20210131033248.1502385-13-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=nG5vjm+t; 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 4DSxYt4pvTz9t0J for <incoming@patchwork.ozlabs.org>; Sun, 31 Jan 2021 14:36:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 195FD826B2; Sun, 31 Jan 2021 04:34:05 +0100 (CET) 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="nG5vjm+t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 54CED82642; Sun, 31 Jan 2021 04:33:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE 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 41FDB82361 for <u-boot@lists.denx.de>; Sun, 31 Jan 2021 04:33:14 +0100 (CET) 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 p72so13676810iod.12 for <u-boot@lists.denx.de>; Sat, 30 Jan 2021 19:33:14 -0800 (PST) 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=oss/3DWQFFWy4QX+NM1QdQmMwsaG4nGhqfeMrIu+Fm0=; b=nG5vjm+tb5zzmY/5wqGOQ/A1AgfesJxCJQRspEUEmIx7o4DW/nwVHEwtCP6XxylrCR Un5qH5aI8RjL2FoHFRUNsKyrQYWk0H2XcGj1tM7UUHHYRDp+RdGW954qdel7B0QjHwwD b+MH8RTYg9yWzeXyHGCkG1a+i6vkNjUOxx04U= 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=oss/3DWQFFWy4QX+NM1QdQmMwsaG4nGhqfeMrIu+Fm0=; b=c/3gAN3tmLGo7PsA2RVMzbU18tOpP5RDgmsFQgYa7wD6LcWBF+PX2352BwswXNMKd2 UrmYk5tMgLdnB8pyun+PNHx0ktaH7sCib7KguEHdBz/hC4agu2zIjAas+0Na5/fpWCis yODXiHhRnXIOtfJMSRoqmje4GLp0fnK923Cc3OOu9gTxajuayTGrWRFuZnbc8Pazciw0 cSLY/rEHJ0BxwOG43GyFDScPim3XuQvqjnB/0oNgZhx+1QMQfNIKrPzz/Q3cZ10BRe2s 14rDVdamQVEwPd7OmuIebeTzuZouLxQWalf9bo0SpzR4J5iYlQURKoP01GPa+3825iuX Fkjw== X-Gm-Message-State: AOAM532wHb8YlO3rGUZpLgjMJ2U3VDcG6OYhK3vsikmu/SOqw0seQlwJ 62omBD4adltis4opCJ1pxDrWk+JvGHNUJ+n+ X-Google-Smtp-Source: ABdhPJy41NaZSjdU1sL8kmpO6cLPR67Anh6UtQd113J/eXwaUrGpVq82jJ0ZRvYpAfF/HCrIDwc6pw== X-Received: by 2002:a05:6638:b12:: with SMTP id a18mr9486952jab.114.1612063992861; Sat, 30 Jan 2021 19:33:12 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id n193sm6086745iod.21.2021.01.30.19.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jan 2021 19:33:12 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>, Stephen Warren <swarren@wwwdotorg.org>, Stephen Warren <swarren@nvidia.com>, Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH v2 12/40] test: Move dm_extended_scan() to test_pre_run() Date: Sat, 30 Jan 2021 20:32:20 -0700 Message-Id: <20210131033248.1502385-13-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog In-Reply-To: <20210131033248.1502385-1-sjg@chromium.org> References: <20210131033248.1502385-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
test: Refactor tests to have a single test runner
|
expand
|
diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index 3b1460327ad..3f9ce3d6fa8 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -92,9 +92,6 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test, ut_assertok(dm_scan_plat(false)); if (test->flags & UT_TESTF_PROBE_TEST) ut_assertok(do_autoprobe(uts)); - if (!CONFIG_IS_ENABLED(OF_PLATDATA) && - (test->flags & UT_TESTF_SCAN_FDT)) - ut_assertok(dm_extended_scan(false)); ut_assertok(test_pre_run(uts, test)); diff --git a/test/test-main.c b/test/test-main.c index 9c600094740..a971fe0e9c8 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -6,7 +6,10 @@ #include <common.h> #include <console.h> +#include <dm.h> +#include <dm/root.h> #include <test/test.h> +#include <test/ut.h> DECLARE_GLOBAL_DATA_PTR; @@ -16,6 +19,10 @@ int test_pre_run(struct unit_test_state *uts, struct unit_test *test) if (!(test->flags & UT_TESTF_DM)) uts->start = mallinfo(); + if (!CONFIG_IS_ENABLED(OF_PLATDATA) && + (test->flags & UT_TESTF_SCAN_FDT)) + ut_assertok(dm_extended_scan(false)); + if (test->flags & UT_TESTF_CONSOLE_REC) { int ret = console_record_reset_enable();
Move this step over to the pre-run function. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) test/dm/test-dm.c | 3 --- test/test-main.c | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-)