alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-31 13:09:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix flasher_args.json parser (iterate over dictionary)

Browse Source 
Closes IDFCI-347
This commit is contained in:
Omar Chebib
2020-12-28 14:09:20 +08:00
parent 0b31f6a5fc
commit fcbc706a66
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esptool_py/esptool

Submodule components/esptool_py/esptool updated: 4fa0bd7b0d...8270199920

6
tools/ci/python_packages/ttfw_idf/IDFApp.py
View File

@@ -32,7 +32,7 @@ except ImportError:
def parse_encrypted_flag(args, offs, binary): def parse_encrypted_flag(args, offs, binary):
# Find partition entries (e.g. the entries with an offset and a file) # Find partition entries (e.g. the entries with an offset and a file)
for _, entry in args: for _, entry in args.items():
# If the current entry is a partition, we have to check whether it is # If the current entry is a partition, we have to check whether it is
# the one we are looking for or not # the one we are looking for or not
try: try:
@@ -329,7 +329,7 @@ class IDFApp(App.BaseApp):
(Called from constructor) (Called from constructor)
Returns (flash_files, flash_settings) Returns (flash_files, encrypt_files, flash_settings)
""" """
if self.IDF_FLASH_ARGS_FILE in os.listdir(self.binary_path): if self.IDF_FLASH_ARGS_FILE in os.listdir(self.binary_path):
@@ -352,7 +352,7 @@ class IDFApp(App.BaseApp):
# All files must be encrypted is both file lists are the same # All files must be encrypted is both file lists are the same
flash_settings["encrypt"] = sorted(flash_files) == sorted(encrypt_files) flash_settings["encrypt"] = sorted(flash_files) == sorted(encrypt_files)
return self._int_offs_abs_paths(flash_files), self._int_offs_abs_paths(encrypt_files), self.flash_settings return self._int_offs_abs_paths(flash_files), self._int_offs_abs_paths(encrypt_files), flash_settings
def _parse_partition_table(self): def _parse_partition_table(self):
""" """

1
tools/ci/python_packages/ttfw_idf/IDFDUT.py
View File

@@ -279,6 +279,7 @@ class IDFDUT(DUT.SerialDUT):
'compress': True, 'compress': True,
'verify': False, 'verify': False,
'encrypt': encrypt, 'encrypt': encrypt,
'ignore_flash_encryption_efuse_setting': False,
'erase_all': False, 'erase_all': False,
}) })