From patchwork Wed May 5 14:15:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1474358 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=85.214.62.61; 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=YDngwAJe; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4FZzLG2RScz9sRR for ; Thu, 6 May 2021 00:17:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5750182D2E; Wed, 5 May 2021 16:16:26 +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="YDngwAJe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B57082D1B; Wed, 5 May 2021 16:16:22 +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-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (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 B433882D14 for ; Wed, 5 May 2021 16:16:17 +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-x42c.google.com with SMTP id v191so2061645pfc.8 for ; Wed, 05 May 2021 07:16:17 -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=HBUtRm41zga2gSDoT1+ExI054r/3axmStjpeDhmCHBA=; b=YDngwAJeNayaGyg2BpV2Kr8hQ0w/kFuWKVZWyUuu+YeFCBXQMaV8DopUb79c9BuHWO dQABqpJ5zs414MLeGAliwGHCzaxIZdS+97KX/dqY/QEDU/JNScodpga1huKWARmQg8OU BBRijsCU9r15DPHKvwl/A35dIsEGf6dWlybC2fTxTtIJwHxMs/oAd/BqgS20YS/FJDBA ejSoTxpMJZZ2U6IqTUI9M0SlYVyRNCs8OzSPYhojt+wkwoheN+DX99wMBE0On1a4nzEr f3P1VCg94BHnH5rtiZVHFe6m00FyIy/RWX+FPeQIW0QoGRK73yFJIYYl912BF+zWgQFP rHpA== 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=HBUtRm41zga2gSDoT1+ExI054r/3axmStjpeDhmCHBA=; b=rvwimAwSvXQJ0M1g3g5plyOWhwBimeLAdyxJEzlkvnlIP3KoDZ8McEWESDy4ZKPgmT rjxv14aZCN+3UOESIk5SP0aLArfkkBjFbUGpCQ6RI1hHYfwd2ZhT+hcYLgDU0wNkNdbF C5dNw0mRQ4kuPPPn/SZ8fU1e1doGkMxsmKhStKUH8rVXcgCCSNbLJxoNBJLar25UkKXq aRZm91Z7B8R5P/tRzY8K+tRIjW/L1cq/ey/JzVoeHJTxJx9vTEe1Nm8CdxN+7CQ+oYhW OwgS6CxnM+UPfcFCwYZJ5nVyumsANqA1oM4/qJMNwPuEGCJRjM2DtEMh4H8kXxQLZ2ny sWlw== X-Gm-Message-State: AOAM533vmtRIwk5EzZVwegQWRsI5qJGJl5EmrpYFXlBzTZ4mOnKAf7Nz 58DDF9h/RD2AoijVnddde6cx4jgKNhg= X-Google-Smtp-Source: ABdhPJwdlx6ohrgj+DeV5LOKBGvOzP8rLEJAtCa8Kk5R4T9h1kP0WL7D5lr8aYyTQVqyN+y9YRoESw== X-Received: by 2002:a62:6142:0:b029:28e:b072:6b7 with SMTP id v63-20020a6261420000b029028eb07206b7mr12793154pfb.65.1620224176265; Wed, 05 May 2021 07:16:16 -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 t10sm7831482pju.18.2021.05.05.07.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 07:16:16 -0700 (PDT) From: Bin Meng To: Simon Glass , u-boot@lists.denx.de Cc: Rick Chen , Bin Meng Subject: [PATCH 4/9] binman: test: Rename 172_fit_fdt.dts to 170_fit_fdt.dts Date: Wed, 5 May 2021 22:15:52 +0800 Message-Id: <20210505141557.23901-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505141557.23901-1-bmeng.cn@gmail.com> References: <20210505141557.23901-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 --- tools/binman/ftest.py | 12 ++++++------ .../binman/test/{172_fit_fdt.dts => 170_fit_fdt.dts} | 0 2 files changed, 6 insertions(+), 6 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..08f84cd32d 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)) @@ -3862,7 +3862,7 @@ class TestFunctional(unittest.TestCase): def testFitFdtMissingProp(self): """Test handling of a missing 'fit,fdt-list' property""" with self.assertRaises(ValueError) as e: - self._DoReadFile('171_fit_fdt_missing_prop.dts') + self._DoReadFile('170_fit_fdt_missing_prop.dts') self.assertIn("Generator node requires 'fit,fdt-list' property", 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