From dfdd2b62173e473580e51804b718389bad37ee3a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 24 Aug 2019 07:23:02 -0600 Subject: [PATCH] binman: Rename some two-digit test files Two of the test files somehow were not converted to three digits. Fix them, using the next available numbers. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 4 ++-- ...rt_together.dts => 098_4gb_and_skip_at_start_together.dts} | 0 ...g_resetvec.dts => 150_powerpc_mpc85xx_bootpg_resetvec.dts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tools/binman/test/{80_4gb_and_skip_at_start_together.dts => 098_4gb_and_skip_at_start_together.dts} (100%) rename tools/binman/test/{81_powerpc_mpc85xx_bootpg_resetvec.dts => 150_powerpc_mpc85xx_bootpg_resetvec.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 2e85a87e30..fe3365255f 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -906,7 +906,7 @@ class TestFunctional(unittest.TestCase): """Test that the end-at-4gb and skip-at-size property can't be used together""" with self.assertRaises(ValueError) as e: - self._DoTestFile('80_4gb_and_skip_at_start_together.dts') + self._DoTestFile('098_4gb_and_skip_at_start_together.dts') self.assertIn("Image '/binman': Provide either 'end-at-4gb' or " "'skip-at-start'", str(e.exception)) @@ -962,7 +962,7 @@ class TestFunctional(unittest.TestCase): def testPackPowerpcMpc85xxBootpgResetvec(self): """Test that an image with powerpc-mpc85xx-bootpg-resetvec can be created""" - data = self._DoReadFile('81_powerpc_mpc85xx_bootpg_resetvec.dts') + data = self._DoReadFile('150_powerpc_mpc85xx_bootpg_resetvec.dts') self.assertEqual(PPC_MPC85XX_BR_DATA, data[:len(PPC_MPC85XX_BR_DATA)]) def _RunMicrocodeTest(self, dts_fname, nodtb_data, ucode_second=False): diff --git a/tools/binman/test/80_4gb_and_skip_at_start_together.dts b/tools/binman/test/098_4gb_and_skip_at_start_together.dts similarity index 100% rename from tools/binman/test/80_4gb_and_skip_at_start_together.dts rename to tools/binman/test/098_4gb_and_skip_at_start_together.dts diff --git a/tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts b/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts similarity index 100% rename from tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts rename to tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts -- 2.25.1