From patchwork Mon May 10 12:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1476355 X-Patchwork-Delegate: uboot@andestech.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 (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YBr6B54o; 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 4Ff0c9309Dz9rx6 for ; Mon, 10 May 2021 22:24:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 447B082EE0; Mon, 10 May 2021 14:24:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="YBr6B54o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F333E82EE0; Mon, 10 May 2021 14:24:04 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) (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 5404882EC5 for ; Mon, 10 May 2021 14:23:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x435.google.com with SMTP id i13so13605734pfu.2 for ; Mon, 10 May 2021 05:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BL+R78M3H0P+ynCzUsUFKeSMkaBVmQ9vrZW687u08+g=; b=YBr6B54ow1WHQ4jx5NgMQ+KQaSCy3v0jO6pDHKq00VzpEk88AgGf5y8YwaccBm5Dsj OiexR9ZlqV1I2e8fJkiZz1Rqg56NegW84UsqnvJI/Kr59lMOIdGvuyYUK3Yg9YoHL9fO ebbP6sIAB7m8YiIkMvnN/y2j+kB+3kGDu89L6EtHdhBIxL7Ts3BryCpAGTETZD1EXUY+ bOsTvLeEiIuKbZo/ts47g1R2zaDU2/3ycRAPAX6gI5eAinvnpRHU8R02BE/7mzy7J3nM TRjbjIkxFempCM0jHyTATuZloBqXQ3Z98lpm9vj8rZu7xgHPVvI1yxhwyuSlqnAehBWF 7X2w== 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=BL+R78M3H0P+ynCzUsUFKeSMkaBVmQ9vrZW687u08+g=; b=G/8LldYPKzlxQ254ElVDuhkLMVWYQGbp78uq7CuJuMLmkFCarMHr4qBbyNk49xZIRE RCd5FUYSsoG1K3cEF9QEIHTssUNLb3RJb5gCIuqb1OxqSEaqNvBJp3bpek1aD5VaexNs XZKbAt6gOMkKSRe0nUwu9d1CQcbbtED+aRgSrFkp3PUqx4BbSYoSB7uKRgDS6wZH6V5V Xngz5GtWS6J6go2KgmPJVC6ghA3QlPiEP8gHRTSq1FVPh8e2AZERzmIsqTAoioMFeMwk 5aPhz2RkAiawL9r61KuW/uw887zrbQvMXfDZcmJao0tEg5/F8IemQ3O4IUL11IiNZhT5 rGQw== X-Gm-Message-State: AOAM533JCRl6wGCIMtcvFdXabUYi/MEBB46ThfbwRXoTZmYcFZE3j2cd y/l/JWCUUdIxWmcYnQEHgag= X-Google-Smtp-Source: ABdhPJxWAdWzBV2mXxw4rNgB1O4QA8N8XI5lNcTmBuiS6yB6O5YimKyW4ehjWmFFeF7r2FXbD10lqQ== X-Received: by 2002:a63:ba5b:: with SMTP id l27mr25276535pgu.343.1620649437000; Mon, 10 May 2021 05:23:57 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id d3sm1405661pfn.141.2021.05.10.05.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:23:56 -0700 (PDT) From: Bin Meng To: Simon Glass , Rick Chen , u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH v5 04/13] binman: test: Rename 172_fit_fdt.dts to 170_fit_fdt.dts Date: Mon, 10 May 2021 20:23:32 +0800 Message-Id: <20210510122341.13798-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510122341.13798-1-bmeng.cn@gmail.com> References: <20210510122341.13798-1-bmeng.cn@gmail.com> 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.4 at phobos.denx.de X-Virus-Status: Clean Currently there are 2 binman test cases using the same 172 number. It seems that 172_fit_fdt.dts was originally named as 170_, but commit c0f1ebe9c1b9 ("binman: Allow selecting default FIT configuration") changed its name to 172_ for no reason. Let's change it back. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- (no changes since v1) tools/binman/ftest.py | 10 +++++----- tools/binman/test/{172_fit_fdt.dts => 170_fit_fdt.dts} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename tools/binman/test/{172_fit_fdt.dts => 170_fit_fdt.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index f36823f51b..b0daccbc3b 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -3826,7 +3826,7 @@ class TestFunctional(unittest.TestCase): 'default-dt': 'test-fdt2', } data = self._DoReadFileDtb( - '172_fit_fdt.dts', + '170_fit_fdt.dts', entry_args=entry_args, extra_indirs=[os.path.join(self._indir, TEST_FDT_SUBDIR)])[0] self.assertEqual(U_BOOT_NODTB_DATA, data[-len(U_BOOT_NODTB_DATA):]) @@ -3848,7 +3848,7 @@ class TestFunctional(unittest.TestCase): def testFitFdtMissingList(self): """Test handling of a missing 'of-list' entry arg""" with self.assertRaises(ValueError) as e: - self._DoReadFile('172_fit_fdt.dts') + self._DoReadFile('170_fit_fdt.dts') self.assertIn("Generator node requires 'of-list' entry argument", str(e.exception)) @@ -3871,7 +3871,7 @@ class TestFunctional(unittest.TestCase): entry_args = { 'of-list': '', } - data = self._DoReadFileDtb('172_fit_fdt.dts', entry_args=entry_args)[0] + data = self._DoReadFileDtb('170_fit_fdt.dts', entry_args=entry_args)[0] def testFitFdtMissing(self): """Test handling of a missing 'default-dt' entry arg""" @@ -3880,7 +3880,7 @@ class TestFunctional(unittest.TestCase): } with self.assertRaises(ValueError) as e: self._DoReadFileDtb( - '172_fit_fdt.dts', + '170_fit_fdt.dts', entry_args=entry_args, extra_indirs=[os.path.join(self._indir, TEST_FDT_SUBDIR)])[0] self.assertIn("Generated 'default' node requires default-dt entry argument", @@ -3894,7 +3894,7 @@ class TestFunctional(unittest.TestCase): } with self.assertRaises(ValueError) as e: self._DoReadFileDtb( - '172_fit_fdt.dts', + '170_fit_fdt.dts', entry_args=entry_args, extra_indirs=[os.path.join(self._indir, TEST_FDT_SUBDIR)])[0] self.assertIn("default-dt entry argument 'test-fdt3' not found in fdt list: test-fdt1, test-fdt2", diff --git a/tools/binman/test/172_fit_fdt.dts b/tools/binman/test/170_fit_fdt.dts similarity index 100% rename from tools/binman/test/172_fit_fdt.dts rename to tools/binman/test/170_fit_fdt.dts