From patchwork Wed Feb 3 12:44:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1435277 X-Patchwork-Delegate: trini@ti.com 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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=UEvipCpG; 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 4DW1hT5SSYz9sWk for ; Wed, 3 Feb 2021 23:48:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C5DB9827FC; Wed, 3 Feb 2021 13:46:58 +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="UEvipCpG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 975328280F; Wed, 3 Feb 2021 13:46:18 +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.4 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-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (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 592E2827FF for ; Wed, 3 Feb 2021 13:46:12 +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-qt1-x835.google.com with SMTP id o18so17395158qtp.10 for ; Wed, 03 Feb 2021 04:46:12 -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=e0Uewf0RV4xSpofUQfnFgIEsnT9BcXtwG0yYpZkUrdo=; b=UEvipCpGVHykG/caY8zD4V1uhb0uPSiDqETDtsldQDfsxi3HYmmavQcl29e3LGTDTL bldiQhNDUKKN+wFlNablFgKLtc38janqq8lO40MomkYMIX0uxKXSv8DDOCbYAYFnt4XD PwluNi1iheRFlTLcTuwNDtdcX0H2pDfxExydw= 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=e0Uewf0RV4xSpofUQfnFgIEsnT9BcXtwG0yYpZkUrdo=; b=I8lWP+PpC87pUt9OeyERf0iBwu6w7229yLpEvcUWNjFeA5b9Z2HesOXz8QsCyDgJel zhlfueLXKuYrC8XAo37ltMwf5PhZWHvoZnyGUzVsR+FUAQcO2BVY8NWEl06J0INIBdI4 HxjHrO+5KU2T9boU/ANnrkCuasTxJYKMZOFWggd4C6UKSu+A4yDUmd+SaMkAYP9vVouA dsqiBqr58n+Y+GG4tO/41XJZgYQbqxvCQO8GlBum68hbcbF2cAHmIeILTh0c8B2PDO4m P4bEWgwc0wmPTs/xFNPyTQjZVb+TdiN3vB0MVouvviCZ75UdgAQKZk7cRBYzTQ1n3PiK 2QRA== X-Gm-Message-State: AOAM5305svnTiwXnSPcS9pGJEg2D6vXQFa/VqaYNhZyIk3XtoQKV8MiY i9YvwjHoLalJLULrTXWFT3b1jXx1bXaqt/AD X-Google-Smtp-Source: ABdhPJxHNi5i+q7wzzLDAf2+mVqCXs3da/qggDbJRQ9HFWZbrGuwrgCfaWS0dx4OfptFz3u8gtx3wQ== X-Received: by 2002:ac8:78a:: with SMTP id l10mr2235020qth.10.1612356371031; Wed, 03 Feb 2021 04:46:11 -0800 (PST) Received: from sjg1.roam.corp.google.com ([50.225.158.38]) by smtp.gmail.com with ESMTPSA id p26sm1560903qkk.6.2021.02.03.04.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 04:46:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Stephen Warren , Stephen Warren , Heinrich Schuchardt , Tom Rini , Simon Glass Subject: [PATCH v3 15/41] test: Move dm_scan_plat() to test_pre_run() Date: Wed, 3 Feb 2021 05:44:21 -0700 Message-Id: <20210203124447.2458527-15-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog In-Reply-To: <20210203124447.2458527-1-sjg@chromium.org> References: <20210203124447.2458527-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 Move this step over to the pre-run function. Signed-off-by: Simon Glass --- (no changes since v1) test/dm/test-dm.c | 2 -- test/test-main.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index 3f76a1dc2c2..65b89dbb936 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -73,8 +73,6 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test, ut_assertok(dm_test_init(uts, of_live)); uts->start = mallinfo(); - if (test->flags & UT_TESTF_SCAN_PDATA) - ut_assertok(dm_scan_plat(false)); ut_assertok(test_pre_run(uts, test)); diff --git a/test/test-main.c b/test/test-main.c index bd2f08a2b42..fe96d739dc4 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -34,6 +34,9 @@ int test_pre_run(struct unit_test_state *uts, struct unit_test *test) if (!(test->flags & UT_TESTF_DM)) uts->start = mallinfo(); + if (test->flags & UT_TESTF_SCAN_PDATA) + ut_assertok(dm_scan_plat(false)); + if (test->flags & UT_TESTF_PROBE_TEST) ut_assertok(do_autoprobe(uts));