From patchwork Wed Oct 9 14:02:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 833950 Delivered-To: patch@linaro.org Received: by 2002:adf:a1de:0:b0:37d:45d0:187 with SMTP id v30csp123858wrv; Wed, 9 Oct 2024 07:04:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUTO0GSVDk078953vpktz7scWCMylR38gBx5qPANaZoasVDTL1+rgdNhBHJJvdtjRhmp6Yhaw==@linaro.org X-Google-Smtp-Source: AGHT+IET2vAt5uq7mZdSBxLcO6iiO1vuT7nJ7WvuN4vkl3N+s6fJw8FE/2ECcGLYLL/7hSW5u1Vh X-Received: by 2002:a5d:4a0c:0:b0:374:c075:ff34 with SMTP id ffacd0b85a97d-37d3aa70595mr1816429f8f.38.1728482666872; Wed, 09 Oct 2024 07:04:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728482666; cv=none; d=google.com; s=arc-20240605; b=l1Ew6KvRHftOAMsbpIqATYEIuoe+CDPbJ8fP/JQtV88UIXuqoeRamyy9kYCVvsix+P /QE0PlDgibpgo42sZW5vH0qSqvZEqkGhgl8dg63JQDbk+2YI2tTSMb7FITZXT9HKDews 7PjDHO0aYJxNiKrAoP7Zzpz14oglPQkslJdlvm9lFv+FwqEuIMXdx+GEvDUaofBG8Q1H JhleG108TZ1f4EMmn5wuF0XerUqFhTMnBJ5MWTaaocSDYCRGfDbwZKZXbxu1FF8EyJbQ L5ohFOhxWDadAJHPi9mLcQYmXhuErotEXn6YLiqrbJeS8be4egq4QRXAX/u5ajMo0sKC MUgQ== 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=JIBwzoFycoUBSX0xnuFXkrdeaNAsZcqb9nYw3LM5bhv938vkXY1xSA6Pt0w99GGNhL Uo9lszOMmzsIrB5rNEbFeypJMvRKoFu9GdxAS+e1rtY1qYTiCjGGV7Os7qxLYsyejilA +CyO4ywqhok6dEtU1O1Gwk0UV/VTrxLzdmJe429RaFeNkBGySehx3qZiflTKvUk/2ZxH bFk7bFfFl44NAye4aG7oVSxpu9G8mk9QioGYq09+q/3JE3sdzbqSFfvh8/YX5rnbhjRM /QuRymm1YeGnuep/yC5jEwDQu8ehduw+DuXwbf/Er1SG/zt3zu6nDk1FxlyJXrLiJ/Zu 6CKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=htWuWAQ+; 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 ffacd0b85a97d-37d1691a7d4si4598477f8f.229.2024.10.09.07.04.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 07:04:26 -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=htWuWAQ+; 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 BA4F28924F; Wed, 9 Oct 2024 16:03:51 +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="htWuWAQ+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A85358924E; Wed, 9 Oct 2024 16:03:48 +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-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) (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 A0D2989249 for ; Wed, 9 Oct 2024 16:03:46 +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-wr1-x433.google.com with SMTP id ffacd0b85a97d-37ccd50faafso4457596f8f.3 for ; Wed, 09 Oct 2024 07:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728482625; x=1729087425; 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=htWuWAQ+F3ZenDoTfaCz1N0X5k6QOQS86SO8sGL4CtHaDOWjpcTy4l/S0uV8jTeWCn KI2qlFzdL2eKQcjm/Rvxxvh5wR2x9nXNN+28aKdo3nDCIXkFfKLGsKx/a9nuTj0+hqmX yfTXtNi7JfmMI9jxGOtq+HQBSl5x8MfBBxVJMiEKgqJvUbYONsyjKaZ+C3BmOV8DO8Ai 0DcxhVKX6v6TDRZuwpfiKhPoo+FUL0/1h+TTGVkOWOBio4X+PvlHd5T3l6rNgLgUdRyd x1AEW1WbROLQVKD1ghgITEpZN6DRl9xU4yiCy6Zje6E5je+5xOwN132U9aeBWP/BaNmr bvqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728482625; x=1729087425; 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=OKqeiIPXIgZ545NV0YDP/dyHK9CsiQi8UvKsSIt2bib3/j8pUbfiWXk5GUK4cM/6fV joc2uTEj+2NMg5Z8QWc+/X/QeQA8niWHO85NwDmon9n31tfapM+znJXaK35Wb+SJtlZz oom+ISAlGrU/rfs+mXn+u19Gjud5elsG1pfYOElS3ymV8SMgGMk/p9nECZrLCZdOF/fY +wTstcbb2S8/j9sDmiwMD5ExHeG/jBLzQjtafYqNEIijwY7hWP7kGBCe9CIk/6/h8zF0 Z8UrfwhHOBs7Reu0UVUEIsaVR9yQnlvPKicQb9lpDJQX2WX+p62U+kuAUOtj+bZS50fC mhKA== X-Gm-Message-State: AOJu0Yy748fKucWEsK4vDCrYDwqmNn1wdKngb6lendL82B5y6f0n2c79 2qQA026XDmw96rmzG2CQwFxFWJeC0VIyiJRkZ/F5ARak5zp2Hyn70chf0OWLuN8EsZyPCGTsCdv dRHVA0A== X-Received: by 2002:a5d:650e:0:b0:37d:3a76:be9f with SMTP id ffacd0b85a97d-37d3a9f8712mr1620277f8f.25.1728482624573; Wed, 09 Oct 2024 07:03:44 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:9b46:2ad8:5153:1163]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d1690f0b2sm10581728f8f.9.2024.10.09.07.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 07:03:43 -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 v12 04/21] test: boot: fix bootflow_cmd_label for when DSA_SANDBOX is disabled Date: Wed, 9 Oct 2024 16:02:54 +0200 Message-Id: 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));