fix: override sdkconfig item keep possible double quotes

double-quoted item represents it's a string type
espressif · Mar 4, 2024 · 86a357e · 86a357e
1 parent fcaf040
commit 86a357e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/idf_build_apps/session_args.py b/idf_build_apps/session_args.py
@@ -51,7 +51,7 @@ def _get_override_sdkconfig_files_items(self, override_sdkconfig_files: t.Tuple[
 
             with open(f) as fr:
                 for line in fr:
-                    m = re.compile(r'^([^=]+)=\"?([^\"\n]*)\"?\n*$').match(line)
+                    m = re.compile(r'^([^=]+)=([^\n]*)\n*$').match(line)
                     if not m:
                         continue
                     d[m.group(1)] = m.group(2)
@@ -60,7 +60,7 @@ def _get_override_sdkconfig_files_items(self, override_sdkconfig_files: t.Tuple[
     def _get_override_sdkconfig_items(self, override_sdkconfig_items: t.Tuple[str]) -> t.Dict:
         d = {}
         for line in override_sdkconfig_items:
-            m = re.compile(r'^([^=]+)=\"?([^\"\n]*)\"?\n*$').match(line)
+            m = re.compile(r'^([^=]+)=([^\n]*)\n*$').match(line)
             if m:
                 d[m.group(1)] = m.group(2)
         return d

diff --git a/tests/test_finder.py b/tests/test_finder.py
@@ -494,14 +494,15 @@ def test_with_sdkconfig_override(self, tmp_path):
 
         Args = namedtuple('Args', ['override_sdkconfig_items', 'override_sdkconfig_files'])
         args = Args(
-            'CONFIG_IDF_TARGET=esp32c3,CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1522,CONFIG_A=10', 'sdkconfig.override1'
+            'CONFIG_IDF_TARGET=esp32c3,CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1522,CONFIG_A=10,CONFIG_C="test"',
+            'sdkconfig.override1',
         )
         idf_build_apps.SESSION_ARGS.set(args, workdir=tmp_path)
         session_args = idf_build_apps.SESSION_ARGS
 
         assert str(tmp_path) in str(session_args.override_sdkconfig_file_path)
-        assert len(session_args.override_sdkconfig_items) == 4
-        assert len(set(session_args.override_sdkconfig_items)) == 4
+        assert len(session_args.override_sdkconfig_items) == 5
+        assert len(set(session_args.override_sdkconfig_items)) == 5
 
         apps = find_apps(str(tmp_path / 'test1'), 'esp32s2')
         assert len(apps) == 0
@@ -514,13 +515,14 @@ def test_with_sdkconfig_override(self, tmp_path):
 
         with open(apps[0].sdkconfig_files[-1]) as fr:
             lines = fr.readlines()
-            assert len(lines) == 4
+            assert len(lines) == 5
             for _l in lines:
                 assert _l in [
                     'CONFIG_IDF_TARGET=esp32c3\n',
                     'CONFIG_A=10\n',
                     'CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1522\n',
                     'CONFIG_B=33\n',
+                    'CONFIG_C="test"\n',
                 ]
 
     def test_config_name_in_manifest(self, tmp_path):