From: Bin Meng <bmeng.cn@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v4 04/13] binman: test: Rename 172_fit_fdt.dts to 170_fit_fdt.dts
Date: Mon, 10 May 2021 14:58:28 +0800 [thread overview]
Message-ID: <20210510065837.2008556-5-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20210510065837.2008556-1-bmeng.cn@gmail.com>
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 <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(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
--
2.25.1
next prev parent reply other threads:[~2021-05-10 6:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 6:58 [PATCH v4 00/13] riscv: Switch to use binman to generate u-boot.itb Bin Meng
2021-05-10 6:58 ` [PATCH v4 01/13] common: kconfig: Correct a typo in SPL_LOAD_FIT Bin Meng
2021-05-10 6:58 ` [PATCH v4 02/13] binman: Correct '-a' description in the doc Bin Meng
2021-05-10 6:58 ` [PATCH v4 03/13] binman: Correct the comment for ATF entry type Bin Meng
2021-05-10 6:58 ` Bin Meng [this message]
2021-05-10 6:58 ` [PATCH v4 05/13] binman: Add support for RISC-V OpenSBI fw_dynamic blob Bin Meng
2021-05-10 6:58 ` [PATCH v4 06/13] makefile: Pass OpenSBI blob to binman make rules Bin Meng
2021-05-10 6:58 ` [PATCH v4 07/13] riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb Bin Meng
2021-05-10 6:58 ` [PATCH v4 08/13] lib: kconfig: Limit BINMAN_FDT for OF_SEPARATE or OF_EMBED Bin Meng
2021-05-10 6:58 ` [PATCH v4 09/13] binman: Support packaging U-Boot for scenarios like OF_BOARD or OF_PRIOR_STAGE Bin Meng
2021-05-10 6:58 ` [PATCH v4 10/13] riscv: dts: Sort build targets in alphabetical order Bin Meng
2021-05-10 6:58 ` [PATCH v4 11/13] riscv: qemu: Switch to use binman to generate u-boot.itb Bin Meng
2021-05-10 6:58 ` [PATCH v4 12/13] riscv: ae350: " Bin Meng
2021-05-10 6:58 ` [PATCH v4 13/13] riscv: Drop USE_SPL_FIT_GENERATOR Bin Meng
2021-05-10 7:02 ` [PATCH v4 00/13] riscv: Switch to use binman to generate u-boot.itb Bin Meng
[not found] ` <752D002CFF5D0F4FA35C0100F1D73F3FE5EA0826@ATCPCS12.andestech.com>
2021-05-10 7:06 ` FW: " Rick Chen
2021-05-10 7:22 ` Rick Chen
2021-05-10 7:32 ` Bin Meng
2021-05-11 0:49 ` Rick Chen
2021-05-11 3:48 ` Bin Meng
2021-05-11 3:51 ` Rick Chen
2021-05-12 3:25 ` Rick Chen
2021-05-12 3:32 ` Bin Meng
2021-05-17 2:09 ` Bin Meng
2021-05-17 8:09 ` Rick Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510065837.2008556-5-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.