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 C1A1BC001B0 for ; Mon, 24 Jul 2023 15:20:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5BD8A86834; Mon, 24 Jul 2023 17:20:25 +0200 (CEST) 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="WReSFuKD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FAF786830; Mon, 24 Jul 2023 17:20:22 +0200 (CEST) Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) (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 29A438062D for ; Mon, 24 Jul 2023 17:20:20 +0200 (CEST) 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-xd2d.google.com with SMTP id ca18e2360f4ac-78372b896d0so168608839f.2 for ; Mon, 24 Jul 2023 08:20:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1690212018; x=1690816818; 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=7DxtilD538dOWAoK82W9QDp+pq1pbZ0n6nAydXnERKY=; b=WReSFuKDHQQtpU2rD7SfYFBcZ01eg/Yp6JNUnxKkxTfhXq9wM2m3N9zSjCK09/WmCD PQ+hIK0RewG3D+wAKuWgazTZNuV3G3QsXxtvjc+Q5KfL10ld4mByHNu+xR7SBeWzsNO5 T9P2aMak+ZuwzGG88eT6edZ8uhAAyYV5xBBRU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690212018; x=1690816818; 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=7DxtilD538dOWAoK82W9QDp+pq1pbZ0n6nAydXnERKY=; b=iT0ByBrxy3GtL1akHApJQ+NJpdfhV7tU8TJon3mQaZirECV2PoxZ4D7Dto+El0VABj skQmOtsfltubrDVSyKeikHoybh7jTzKpI4BREjfDFAZX9WDI2I3+c8Robd039iyOFXz1 CztzjI32RLoUBljZOHUj93v2ndnJPz1FWQ6ylZ0CENpRLFX4+NbzRqG+u20KVRZE3Y5A +Ypj8rNaMZ45UL0ZbmfUH8lL58yzeLkrp0TN3E8VMW2I7sG8v25q5QV80dvTUtLnqR5Q W9gvTLVL9M/8aZsPPodgW4jSHkE/CteFQ8QodaNq+WhSlIlqMAbubLcV/jk/Al5F4krt lK5g== X-Gm-Message-State: ABy/qLbocvhyFYpFn9ywG9b8oTF/HyASIDwZa7bBQ70+KkP82XB6K3AA mpiPa74f8Uv7scILsx5ChEaY3Ij+A8H4j1IyKos= X-Google-Smtp-Source: APBJJlHCY+XRoTr425rVW1Mv5eGq1nEO5RkLCWV62NYBA4yrYWkNjySs/jIQLV90HPadPxkqOKyMRQ== X-Received: by 2002:a5d:924e:0:b0:786:71d0:ff9b with SMTP id e14-20020a5d924e000000b0078671d0ff9bmr230205iol.10.1690212018702; Mon, 24 Jul 2023 08:20:18 -0700 (PDT) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id l21-20020a02ccf5000000b0042b1a9f8480sm2885182jaq.35.2023.07.24.08.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 08:20:18 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Alper Nebi Yasak , Jonas Karlman , Kever Yang , Neha Malcom Francis , Peng Fan , Philipp Tomsich , Philippe Reynes , Stefan Herbrechtsmeier Subject: [PATCH 2/4] binman: Renumber 277_rockchip and 278_mkimage test files Date: Mon, 24 Jul 2023 09:19:58 -0600 Message-ID: <20230724152011.310087-2-sjg@chromium.org> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog In-Reply-To: <20230724152011.310087-1-sjg@chromium.org> References: <20230724152011.310087-1-sjg@chromium.org> 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.8 at phobos.denx.de X-Virus-Status: Clean These have ended up with the same numbers as earlier files. Fix them. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 6 +++--- .../test/{277_rockchip_tpl.dts => 291_rockchip_tpl.dts} | 0 ...issing_multiple.dts => 292_mkimage_missing_multiple.dts} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename tools/binman/test/{277_rockchip_tpl.dts => 291_rockchip_tpl.dts} (100%) rename tools/binman/test/{278_mkimage_missing_multiple.dts => 292_mkimage_missing_multiple.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 376af9fa0806..40d2fd5da1b6 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6683,18 +6683,18 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testPackRockchipTpl(self): """Test that an image with a Rockchip TPL binary can be created""" - data = self._DoReadFile('277_rockchip_tpl.dts') + data = self._DoReadFile('291_rockchip_tpl.dts') self.assertEqual(ROCKCHIP_TPL_DATA, data[:len(ROCKCHIP_TPL_DATA)]) def testMkimageMissingBlobMultiple(self): """Test missing blob with mkimage entry and multiple-data-files""" with test_util.capture_sys_output() as (stdout, stderr): - self._DoTestFile('278_mkimage_missing_multiple.dts', allow_missing=True) + self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=True) err = stderr.getvalue() self.assertIn("is missing external blobs and is non-functional", err) with self.assertRaises(ValueError) as e: - self._DoTestFile('278_mkimage_missing_multiple.dts', allow_missing=False) + self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=False) self.assertIn("not found in input path", str(e.exception)) def _PrepareSignEnv(self, dts='280_fit_sign.dts'): diff --git a/tools/binman/test/277_rockchip_tpl.dts b/tools/binman/test/291_rockchip_tpl.dts similarity index 100% rename from tools/binman/test/277_rockchip_tpl.dts rename to tools/binman/test/291_rockchip_tpl.dts diff --git a/tools/binman/test/278_mkimage_missing_multiple.dts b/tools/binman/test/292_mkimage_missing_multiple.dts similarity index 100% rename from tools/binman/test/278_mkimage_missing_multiple.dts rename to tools/binman/test/292_mkimage_missing_multiple.dts -- 2.41.0.487.g6d72f3e995-goog