summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-07-24 09:19:59 -0600
committerSimon Glass <sjg@chromium.org>2023-07-24 09:33:55 -0600
commita6b44acaf5a3be07caa5fd42ef61d37470cb706a (patch)
treed3c711dd66cc3239915201c5bdfaef1876935d35
parent176f1f68fa2cb42590a9a7cd970396d9c0bf2c65 (diff)
binman: Renumber 277...289 TI test files
These have ended up with the same numbers as earlier files. Fix them. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--tools/binman/ftest.py18
-rw-r--r--tools/binman/test/293_ti_board_cfg.dts (renamed from tools/binman/test/277_ti_board_cfg.dts)0
-rw-r--r--tools/binman/test/294_ti_board_cfg_combined.dts (renamed from tools/binman/test/278_ti_board_cfg_combined.dts)0
-rw-r--r--tools/binman/test/295_ti_board_cfg_no_type.dts (renamed from tools/binman/test/279_ti_board_cfg_no_type.dts)0
-rw-r--r--tools/binman/test/296_ti_secure.dts (renamed from tools/binman/test/279_ti_secure.dts)0
-rw-r--r--tools/binman/test/297_ti_secure_rom.dts (renamed from tools/binman/test/280_ti_secure_rom.dts)0
-rw-r--r--tools/binman/test/298_ti_secure_rom_combined.dts (renamed from tools/binman/test/281_ti_secure_rom_combined.dts)0
-rw-r--r--tools/binman/test/299_ti_secure_rom_a.dts (renamed from tools/binman/test/288_ti_secure_rom_a.dts)0
-rw-r--r--tools/binman/test/300_ti_secure_rom_b.dts (renamed from tools/binman/test/289_ti_secure_rom_b.dts)0
9 files changed, 9 insertions, 9 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 40d2fd5da1b..26913bb094a 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -6930,19 +6930,19 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
def testTIBoardConfig(self):
"""Test that a schema validated board config file can be generated"""
- data = self._DoReadFile('277_ti_board_cfg.dts')
+ data = self._DoReadFile('293_ti_board_cfg.dts')
self.assertEqual(TI_BOARD_CONFIG_DATA, data)
def testTIBoardConfigCombined(self):
"""Test that a schema validated combined board config file can be generated"""
- data = self._DoReadFile('278_ti_board_cfg_combined.dts')
+ data = self._DoReadFile('294_ti_board_cfg_combined.dts')
configlen_noheader = TI_BOARD_CONFIG_DATA * 4
self.assertGreater(data, configlen_noheader)
def testTIBoardConfigNoDataType(self):
"""Test that error is thrown when data type is not supported"""
with self.assertRaises(ValueError) as e:
- data = self._DoReadFile('279_ti_board_cfg_no_type.dts')
+ data = self._DoReadFile('295_ti_board_cfg_no_type.dts')
self.assertIn("Schema validation error", str(e.exception))
def testPackTiSecure(self):
@@ -6951,7 +6951,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
entry_args = {
'keyfile': keyfile,
}
- data = self._DoReadFileDtb('279_ti_secure.dts',
+ data = self._DoReadFileDtb('296_ti_secure.dts',
entry_args=entry_args)[0]
self.assertGreater(len(data), len(TI_UNSECURE_DATA))
@@ -6963,7 +6963,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
'keyfile': keyfile,
}
with test_util.capture_sys_output() as (_, stderr):
- self._DoTestFile('279_ti_secure.dts',
+ self._DoTestFile('296_ti_secure.dts',
force_missing_bintools='openssl',
entry_args=entry_args)
err = stderr.getvalue()
@@ -6975,11 +6975,11 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
entry_args = {
'keyfile': keyfile,
}
- data = self._DoReadFileDtb('280_ti_secure_rom.dts',
+ data = self._DoReadFileDtb('297_ti_secure_rom.dts',
entry_args=entry_args)[0]
- data_a = self._DoReadFileDtb('288_ti_secure_rom_a.dts',
+ data_a = self._DoReadFileDtb('299_ti_secure_rom_a.dts',
entry_args=entry_args)[0]
- data_b = self._DoReadFileDtb('289_ti_secure_rom_b.dts',
+ data_b = self._DoReadFileDtb('300_ti_secure_rom_b.dts',
entry_args=entry_args)[0]
self.assertGreater(len(data), len(TI_UNSECURE_DATA))
self.assertGreater(len(data_a), len(TI_UNSECURE_DATA))
@@ -6991,7 +6991,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
entry_args = {
'keyfile': keyfile,
}
- data = self._DoReadFileDtb('281_ti_secure_rom_combined.dts',
+ data = self._DoReadFileDtb('298_ti_secure_rom_combined.dts',
entry_args=entry_args)[0]
self.assertGreater(len(data), len(TI_UNSECURE_DATA))
diff --git a/tools/binman/test/277_ti_board_cfg.dts b/tools/binman/test/293_ti_board_cfg.dts
index cda024c1b8c..cda024c1b8c 100644
--- a/tools/binman/test/277_ti_board_cfg.dts
+++ b/tools/binman/test/293_ti_board_cfg.dts
diff --git a/tools/binman/test/278_ti_board_cfg_combined.dts b/tools/binman/test/294_ti_board_cfg_combined.dts
index 95ef449cbf4..95ef449cbf4 100644
--- a/tools/binman/test/278_ti_board_cfg_combined.dts
+++ b/tools/binman/test/294_ti_board_cfg_combined.dts
diff --git a/tools/binman/test/279_ti_board_cfg_no_type.dts b/tools/binman/test/295_ti_board_cfg_no_type.dts
index 584b7acc5a4..584b7acc5a4 100644
--- a/tools/binman/test/279_ti_board_cfg_no_type.dts
+++ b/tools/binman/test/295_ti_board_cfg_no_type.dts
diff --git a/tools/binman/test/279_ti_secure.dts b/tools/binman/test/296_ti_secure.dts
index 941d0ab4ca3..941d0ab4ca3 100644
--- a/tools/binman/test/279_ti_secure.dts
+++ b/tools/binman/test/296_ti_secure.dts
diff --git a/tools/binman/test/280_ti_secure_rom.dts b/tools/binman/test/297_ti_secure_rom.dts
index d1313769f43..d1313769f43 100644
--- a/tools/binman/test/280_ti_secure_rom.dts
+++ b/tools/binman/test/297_ti_secure_rom.dts
diff --git a/tools/binman/test/281_ti_secure_rom_combined.dts b/tools/binman/test/298_ti_secure_rom_combined.dts
index bf872739bc1..bf872739bc1 100644
--- a/tools/binman/test/281_ti_secure_rom_combined.dts
+++ b/tools/binman/test/298_ti_secure_rom_combined.dts
diff --git a/tools/binman/test/288_ti_secure_rom_a.dts b/tools/binman/test/299_ti_secure_rom_a.dts
index 887138f0e4b..887138f0e4b 100644
--- a/tools/binman/test/288_ti_secure_rom_a.dts
+++ b/tools/binman/test/299_ti_secure_rom_a.dts
diff --git a/tools/binman/test/289_ti_secure_rom_b.dts b/tools/binman/test/300_ti_secure_rom_b.dts
index c6d6182158c..c6d6182158c 100644
--- a/tools/binman/test/289_ti_secure_rom_b.dts
+++ b/tools/binman/test/300_ti_secure_rom_b.dts