From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C440C433F5 for ; Wed, 12 Jan 2022 20:10:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 495DB834AA; Wed, 12 Jan 2022 21:10:44 +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="CfNoUV2X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 060AF83395; Wed, 12 Jan 2022 21:10:43 +0100 (CET) Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (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 397B383481 for ; Wed, 12 Jan 2022 21:10:40 +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-il1-x132.google.com with SMTP id d3so3486288ilr.10 for ; Wed, 12 Jan 2022 12:10:40 -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:mime-version :content-transfer-encoding; bh=vf2p7iSsPCuAYZBiavBc/YD9T3Di/V2fER2TeTJzxnQ=; b=CfNoUV2XUfLY9bCfPcV0mmIiMPbl0jtyltSJwxJLzJjFO4coJkZq81zdbzzS7mOdRz hWhb5FgD/Oc2SaVllj7JnbXsQ1T+/uIotCN5/w0UrNzkRWSG1wCFPZph28HgMXO2FgeD CHrqvgMfvtPbMyadvZ9bDyFeM3Kb38EqN7tIw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vf2p7iSsPCuAYZBiavBc/YD9T3Di/V2fER2TeTJzxnQ=; b=40yKMCJy1bbk34VQCoOG02yqltQxbIPXge+UyQM+uiQ5mvuG9vnglod79ZHljGajjp N0Pv2PCks4sOEKNAOyyzBPTDSPgBWX7XLDt3DytE/qistdLUtYFE+DzbHznh8vX4Q9CS R9Vu27fkvSuo6UBHNu1x0qqXLvOfGAk66OFEl7IP04SKJ/eAYkIbdDs8SZ7ZALiffuTI JKinJivxjcij7mH6/ZAkBEFjZCvpE4nYhmwbmWcQrftodPHd1jHMC+9VsPFkkvQFA5xm oX12ONTupyqLVG5qvfxbjOpHml5OLn6lbOrXZxrw6e7IDtRBAUq4fz6oedn8bkEmArLB 2K6w== X-Gm-Message-State: AOAM531eMCORw9njIhlb0Eg41ao2Wa3RoIuKm7bJ73N7cDMCDZBmlEQr Z02sp5nqFwaNruNBOJHreabc3h04WmFPJw== X-Google-Smtp-Source: ABdhPJy6cowt3xwzYBwlugXEZtG3xuL+t535VMeJm4dcslDvSdPZIGXrk8qmmtHR0YidLMtXvdi4zw== X-Received: by 2002:a05:6e02:2142:: with SMTP id d2mr806454ilv.141.1642018238714; Wed, 12 Jan 2022 12:10:38 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id l3sm441138ilo.17.2022.01.12.12.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 12:10:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 1/2] binman: Renumber the fake blob dts Date: Wed, 12 Jan 2022 13:10:35 -0700 Message-Id: <20220112201036.300649-1-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.575.g55b058a8bb-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.2 at phobos.denx.de X-Virus-Status: Clean Use a unique number instead of the current 203, which is used by 203_fip as well. Reformat the code to avoid a long line. Signed-off-by: Simon Glass --- Changes in v2: - Add new patch to renumber the fake blob dts tools/binman/ftest.py | 22 ++++++++++--------- .../{203_fake_blob.dts => 217_fake_blob.dts} | 0 2 files changed, 12 insertions(+), 10 deletions(-) rename tools/binman/test/{203_fake_blob.dts => 217_fake_blob.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index a9b7880f362..a9d9160967c 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4667,16 +4667,6 @@ class TestFunctional(unittest.TestCase): str(e.exception), "Not enough space in '.*u_boot_binman_embed_sm' for data length.*") - def testFakeBlob(self): - """Test handling of faking an external blob""" - with test_util.capture_sys_output() as (stdout, stderr): - self._DoTestFile('203_fake_blob.dts', allow_missing=True, - allow_fake_blobs=True) - err = stderr.getvalue() - self.assertRegex(err, - "Image '.*' has faked external blobs and is non-functional: .*") - os.remove('binman_faking_test_blob') - def testVersion(self): """Test we can get the binman version""" version = '(unreleased)' @@ -4965,5 +4955,17 @@ fdt fdtmap Extract the devicetree blob from the fdtmap # There should be a U-Boot after the final FIP self.assertEqual(U_BOOT_DATA, data[-4:]) + def testFakeBlob(self): + """Test handling of faking an external blob""" + with test_util.capture_sys_output() as (stdout, stderr): + self._DoTestFile('217_fake_blob.dts', allow_missing=True, + allow_fake_blobs=True) + err = stderr.getvalue() + self.assertRegex( + err, + "Image '.*' has faked external blobs and is non-functional: .*") + os.remove('binman_faking_test_blob') + + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/203_fake_blob.dts b/tools/binman/test/217_fake_blob.dts similarity index 100% rename from tools/binman/test/203_fake_blob.dts rename to tools/binman/test/217_fake_blob.dts -- 2.34.1.575.g55b058a8bb-goog