From: Simon Glass <[email protected]> The non-dts files should not be numbered. Remove the 340_ prefix from several fies and update ftest.py to match.
Signed-off-by: Simon Glass <[email protected]> --- tools/binman/ftest.py | 16 ++++++++-------- .../{340_dummy-rsa4096.crt => dummy-rsa4096.crt} | 0 .../test/{340_openssl.conf => openssl.conf} | 0 .../binman/test/{340_rsa2048.key => rsa2048.key} | 0 .../test/{340_softhsm2.conf => softhsm2.conf} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename tools/binman/test/{340_dummy-rsa4096.crt => dummy-rsa4096.crt} (100%) rename tools/binman/test/{340_openssl.conf => openssl.conf} (100%) rename tools/binman/test/{340_rsa2048.key => rsa2048.key} (100%) rename tools/binman/test/{340_softhsm2.conf => softhsm2.conf} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 208ac3896dd..202c2adf58d 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -7926,7 +7926,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'default-dt': 'test-fdt1', 'atf-bl31-path': 'bl31.elf', } - data = tools.read_file(self.TestFile("340_rsa2048.key")) + data = tools.read_file(self.TestFile("rsa2048.key")) self._MakeInputFile("keys/rsa2048.key", data) test_subdir = os.path.join(self._indir, TEST_FDT_SUBDIR) @@ -7963,7 +7963,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'atf-bl31-path': 'bl31.elf', } - x509_pubkey = '340_dummy-rsa4096.crt' + x509_pubkey = 'dummy-rsa4096.crt' data = tools.read_file(self.TestFile(x509_pubkey)) self._MakeInputFile('dev.crt', data) @@ -8038,7 +8038,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap prefix = "testFitSignPKCS11Simple." # Configure SoftHSMv2 - data = tools.read_file(self.TestFile('340_softhsm2.conf')) + data = tools.read_file(self.TestFile('softhsm2.conf')) softhsm2_conf = self._MakeInputFile(f'{prefix}softhsm2.conf', data) softhsm2_tokens_dir = self._MakeInputDir(f'{prefix}softhsm2.tokens') @@ -8069,7 +8069,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap test_subdir = os.path.join(self._indir, TEST_FDT_SUBDIR) # Make OpenSSL use softhsm2 engine - ossl_conf = self.TestFile('340_openssl.conf') + ossl_conf = self.TestFile('openssl.conf') with unittest.mock.patch.dict('os.environ', {'OPENSSL_CONF': ossl_conf, 'SOFTHSM2_CONF': softhsm2_conf}): @@ -8113,7 +8113,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap prefix = "testFitSignPKCS11Object." # Configure SoftHSMv2 - data = tools.read_file(self.TestFile('340_softhsm2.conf')) + data = tools.read_file(self.TestFile('softhsm2.conf')) softhsm2_conf = self._MakeInputFile(f'{prefix}softhsm2.conf', data) softhsm2_tokens_dir = self._MakeInputDir(f'{prefix}softhsm2.tokens') @@ -8146,7 +8146,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap # Make OpenSSL use softhsm2 engine and configure PIN for token # The PIN is incorrect on purpose, the correct one will be passed by # MKIMAGE_SIGN_PIN - ossl_conf = self.TestFile('340_openssl.conf') + ossl_conf = self.TestFile('openssl.conf') with unittest.mock.patch.dict('os.environ', {'OPENSSL_CONF': ossl_conf, 'SOFTHSM2_CONF': softhsm2_conf, @@ -8203,9 +8203,9 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'default-dt': 'test-fdt1', 'atf-bl31-path': 'bl31.elf', } - data = tools.read_file(self.TestFile("340_rsa2048.key")) + data = tools.read_file(self.TestFile("rsa2048.key")) self._MakeInputFile("keys1/rsa2048.key", data) - data = tools.read_file(self.TestFile("340_rsa2048.key")) + data = tools.read_file(self.TestFile("rsa2048.key")) self._MakeInputFile("keys2/conf-rsa2048.key", data) test_subdir = os.path.join(self._indir, TEST_FDT_SUBDIR) diff --git a/tools/binman/test/340_dummy-rsa4096.crt b/tools/binman/test/dummy-rsa4096.crt similarity index 100% rename from tools/binman/test/340_dummy-rsa4096.crt rename to tools/binman/test/dummy-rsa4096.crt diff --git a/tools/binman/test/340_openssl.conf b/tools/binman/test/openssl.conf similarity index 100% rename from tools/binman/test/340_openssl.conf rename to tools/binman/test/openssl.conf diff --git a/tools/binman/test/340_rsa2048.key b/tools/binman/test/rsa2048.key similarity index 100% rename from tools/binman/test/340_rsa2048.key rename to tools/binman/test/rsa2048.key diff --git a/tools/binman/test/340_softhsm2.conf b/tools/binman/test/softhsm2.conf similarity index 100% rename from tools/binman/test/340_softhsm2.conf rename to tools/binman/test/softhsm2.conf -- 2.43.0
