Merge branch 'bugfix/parttool_commands_extra_partition_subtypes' into 'master'

parttool: fix parttool commands attribute parsing

Closes IDF-5879

See merge request espressif/esp-idf!20122

components/partition_table/gen_extra_subtypes_inc.py

@@ -14,7 +14,7 @@ def gen_header_file(path: str, subtypes: str) -> None:
             f.write('/*\n\t' + PARTTOOL_USAGE + '\n\t')
             f.write('--extra-partition-subtypes ')
             for line_no in subtypes:
-                f.write(line_no + ' ')
+                f.write(f'"{line_no}" ')
             f.write('\n*/\n\n')
         f.write('#pragma once\n\n')
         for line_no in subtypes:

components/partition_table/parttool.py

@@ -252,6 +252,7 @@ def main():
                                            using the same fallback logic as the IDF bootloader', action='store_true')
 
     partition_selection_parser.add_argument('--partition-subtype', '-s', help='subtype of the partition')
+    partition_selection_parser.add_argument('--extra-partition-subtypes', help='Extra partition subtype entries', nargs='*')
 
     subparsers = parser.add_subparsers(dest='operation', help='run parttool -h for additional help')
 
@@ -270,7 +271,6 @@ def main():
     print_partition_info_subparser.add_argument('--info', help='type of partition information to get',
                                                 choices=['name', 'type', 'subtype', 'offset', 'size', 'encrypted'], default=['offset', 'size'], nargs='+')
     print_partition_info_subparser.add_argument('--part_list', help='Get a list of partitions suitable for a given type', action='store_true')
-    print_partition_info_subparser.add_argument('--extra-partition-subtypes', help='Extra partition subtype entries', nargs='*')
 
     args = parser.parse_args()
     quiet = args.quiet

examples/storage/parttool/partitions_example.csv

@@ -3,4 +3,5 @@
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
 factory,  app,  factory, 0x10000, 1M,
+custom,   data, nvs,     ,        0x1000,
 storage,  data, spiffs,  ,        0x10000,

examples/storage/parttool/pytest_parttool_example.py

@@ -26,3 +26,22 @@ def test_examples_parttool(dut: Dut) -> None:
     script_path = os.path.join(idf_path, 'examples', 'storage', 'parttool', 'parttool_example.py')
     binary_path = os.path.join(dut.app.binary_path, 'parttool.bin')
     subprocess.check_call([sys.executable, script_path, '--binary', binary_path, '--port', dut.serial.port])
+
+    # following tests check the external interface (parsing) of the parttool commands
+    with open('custom.bin', 'wb') as f:
+        f.write(b'0' * 1024 * 4)
+
+    PARTTOOL = os.path.join(idf_path, 'components', 'partition_table', 'parttool.py')
+    BASE_CMD = [sys.executable, PARTTOOL, '--port', dut.serial.port]
+
+    cmds = ['read_partition --partition-type=data --partition-subtype=nvs --output custom1.bin',
+            'erase_partition --partition-name=custom',
+            'write_partition --partition-name=custom --input custom.bin',
+            'get_partition_info --partition-boot-default --info size']
+
+    for cmd in cmds:
+        subprocess.check_call(BASE_CMD + cmd.split())
+
+    clean_files = ['custom.bin', 'custom1.bin']
+    for clean_file in clean_files:
+        os.unlink(clean_file)