From patchwork Wed Oct 16 09:56:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 835792 Delivered-To: patch@linaro.org Received: by 2002:a5d:6804:0:b0:37d:45d0:187 with SMTP id w4csp343465wru; Wed, 16 Oct 2024 02:57:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJTjdXBn9e33knWO8mOYbf+QmHXfqI2THsZRMAS3ef8iLWJRHMJz/zAuQCsRVAED6SU7isRA==@linaro.org X-Google-Smtp-Source: AGHT+IHkJ5SdDqOkqTHaozIe7N2Ch5hU9CE3FCzniSARCmVzDMQAJ7fek9oMWgUUrMSAS0WBs6lA X-Received: by 2002:a05:6602:27c3:b0:837:7f1a:40af with SMTP id ca18e2360f4ac-83a64d9734fmr1315020239f.14.1729072675817; Wed, 16 Oct 2024 02:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729072675; cv=none; d=google.com; s=arc-20240605; b=STUZS335xKSpvArMK1cDsuAlNwLdfc9leR304DS8+Ooh9zE8k5zfEVKwNp3PzMB2oi 5PgBUTuI15t5sbxCHCgfDmSTl/ZgtSrbH6iPmQlr7b49BMYRe3W2MHLcJ79czGnUVCEi +NbpMorgiDJFpR/4taIkXDNw+yFYVlp8ewaX9Q/rImgsw4CK4JURZVsbvmPh0pXIVaDd hwcbEOvLJsY6/hasyN5le0C/D2I+U7XPDvG4JzOohoqrM6/RZ0lPHaQgyUCUNwHdlFFh cwGChJfHRuxGJ1EY/1/K3dMDZJ18K6RGCJhTsbpaqx9OEOTmE5fsVDWlr1Zdd0LXor4Z 4oQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kDutgpxnTxwKCYIiIQtKGwPjtjM6oNAFy+W630CdG0w=; fh=wEMi21KgBJesFM6dn9hReQOkJYiTKn1d3csebleuqj4=; b=Eh0qiYP1E0j0ENRyL7Ld6Sdjqv3ptJgQO01xijqfvb66ypZqn5hcgv/jBmx00fmA6Z uml9lfL+CME4DZxFhQ9l2AnWRwzf9Qpdtcr++0SgLj/xNHuWhvJrp8ugO1ja9Xj0u+Fu 8D6P5mfOWJ2q93CFu/48XUVw7aMfzMaPilq1qc+YW/W7nCVTGIrxn7f5BJALZmcIqSJ6 3qKwawcGlxl+jvpL6KaRl374AI6kN11NIATrQhMdbINeLwrQgbg8CnRTNXqzvKXA/B4T SqCEn1X0OXBpgptKlOfy+NpXU3kvbj4GSsbbl7oSYsSEFfhBuSwGRlaGjDZJ2RamGaCi Fh4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rw+Yn9J0; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ca18e2360f4ac-83a8b210a1bsi152320339f.7.2024.10.16.02.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 02:57:55 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rw+Yn9J0; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E74CB88E02; Wed, 16 Oct 2024 11:57:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Rw+Yn9J0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A6FCD88EE0; Wed, 16 Oct 2024 11:57:16 +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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (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 AF74988F92 for ; Wed, 16 Oct 2024 11:57:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4314311959aso12611735e9.1 for ; Wed, 16 Oct 2024 02:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1729072634; x=1729677434; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kDutgpxnTxwKCYIiIQtKGwPjtjM6oNAFy+W630CdG0w=; b=Rw+Yn9J0XifmOoF64muDMMZsCgi8HXi88WkSZ5+BZweWMMqNa1scevJThnfPjkyiBt yPwKlvEsOJC7p2I6if5kE83KBBW/6T0GUT50v97eIzIJi+72n9+oCCaA/CCDrUnKa9SA aHpvrPrcL/62NgeMGYjgRp0GqXnf1DTI3sQSoG5KNDLmwd31UN6geWz7UCZVKqNHRKgQ CLuEVBzAlZK/ZmyHiifcfH2f9Ga5SGh8dwEk+MRWfNLJGMUAAhPVsqqs9r9ejnLrsoSF zZQXfGxgZq50v+4pXE2CPsz7nB1hnPKaKzRYAeJ5VnMZXZD4+WC4xADFFc2R2orI++Nn WwiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729072634; x=1729677434; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kDutgpxnTxwKCYIiIQtKGwPjtjM6oNAFy+W630CdG0w=; b=nACaX3TYtIHgaPA7kde1WbYk4eOK/Gm8/U6UVNt/QkApYRF/dU8xNENIdyU4SfVY9m IsecpS6VKq/7sV7hN7rRkDwHXEJppD8Z4k6iZFnTt70JhchRVvdd/Ce2oTUbt1NSjFs9 RkYQ/MP/hAYx6r5floI/b2k2eUET/Qd0jDg+rsMdT3V9nMqMmkuDj+MwJlrx8Nn4naXP JFM6tmSO5RDAJoe+YKeF6H0kPI7FuMTctrm5oEn+G6wOyMywYjGU4kN90XqUUakHRkKX YuK8kzwSjpj//pLa/WiAyQX5VQ6VwsLRAGYi45R8bsMQ8r+WQVzky+Qg3xtMbluUcUwN 3jCA== X-Gm-Message-State: AOJu0YwhDk92Yn5v/gayx/nHigmbwQ8L5WLdgNt9pbBxpufI30RMykum ofvoxkvqcYoEKwP44XhjahyO0yIhiI8zJTn51OZbhomWi5rZ7tnVfZebS7xECMTszIizQLrbsu0 86wEREQ== X-Received: by 2002:a05:600c:468b:b0:42f:823d:dddd with SMTP id 5b1f17b1804b1-431256099e0mr106376265e9.27.1729072633991; Wed, 16 Oct 2024 02:57:13 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:6417:8cf6:a7f7:ee38]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4313f6b1ebfsm45236335e9.34.2024.10.16.02.57.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 02:57:13 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Javier Tia , Raymond Mao , Maxim Uvarov , Tim Harvey , Anton Antonov , Jerome Forissier , Simon Glass , Tom Rini , Mattijs Korpershoek , Heinrich Schuchardt , AKASHI Takahiro , Francis Laniel Subject: [PATCH v13 04/21] test: boot: fix bootflow_cmd_label for when DSA_SANDBOX is disabled Date: Wed, 16 Oct 2024 11:56:26 +0200 Message-Id: <3baafbab154d05c19ce882ee0b23e426daaa231e.1729070678.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean When DSA_SANDBOX is not set, the sandbox tests fail as follows: $ ./test/py/test.py --build-dir=$(pwd) -k bootdev_test_any [...] Scanning for bootflows with label '9' [...] Cannot find '9' (err=-19) This is due to the device list containing two less entries than expected. Therefore, look for label '7' when DSA_SANDBOX is disabled. The actual use case is NET_LWIP=y (to be introduced in later patches) which implies DSA_SANDBOX=n for the time being. Signed-off-by: Jerome Forissier --- test/boot/bootflow.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 6ad63afe90a..154dea70a59 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -109,9 +109,17 @@ static int bootflow_cmd_label(struct unit_test_state *uts) * 8 [ ] OK mmc mmc2.bootdev * 9 [ + ] OK mmc mmc1.bootdev * a [ ] OK mmc mmc0.bootdev + * + * However with CONFIG_DSA_SANDBOX=n we have two fewer (dsa-test@0 and + * dsa-test@1). */ - ut_assertok(run_command("bootflow scan -lH 9", 0)); - ut_assert_nextline("Scanning for bootflows with label '9'"); + if (CONFIG_IS_ENABLED(DSA_SANDBOX)) { + ut_assertok(run_command("bootflow scan -lH 9", 0)); + ut_assert_nextline("Scanning for bootflows with label '9'"); + } else { + ut_assertok(run_command("bootflow scan -lH 7", 0)); + ut_assert_nextline("Scanning for bootflows with label '7'"); + } ut_assert_skip_to_line("(1 bootflow, 1 valid)"); ut_assertok(run_command("bootflow scan -lH 0", 0));