Merge pull request #368 from Lapshin/feature/gdbinit-files-generation-update

change: rename prefix_map_gdbinit to gdbinit/prefix_map (RDT-1461)

Author: hfudev

pytest-embedded-idf/pytest_embedded_idf/dut.py

@@ -91,6 +91,14 @@ def panic_output_decode_script(self) -> t.Optional[str]:
 
         return os.path.realpath(script_filepath)
 
+    def _get_prefix_map_path(self) -> str:
+        primary = os.path.join(self.app.binary_path, 'gdbinit', 'prefix_map')
+        fallback = os.path.join(self.app.binary_path, 'prefix_map_gdbinit')
+
+        if os.path.exists(primary):
+            return primary
+        return fallback
+
     def _check_panic_decode_trigger(self):  # type: () -> None
         if not self.app.elf_file:
             logging.warning('No elf file found. Skipping decode panic output...')
@@ -114,7 +122,7 @@ def _check_panic_decode_trigger(self):  # type: () -> None
             cmd = [
                 f'{self.toolchain_prefix}-gdb',
                 '--command',
-                f'{self.app.app_path}/build/prefix_map_gdbinit',
+                self._get_prefix_map_path(),
                 '--batch',
                 '-n',
                 self.app.elf_file,

tests/fixtures/hello_world_linux/build/project_description.json

@@ -21,5 +21,4 @@
     },
     "build_components" : [ "esp_common", "esp_hw_support", "esp_rom", "esp_system", "freertos", "hal", "heap", "linux", "log", "main", "soc", "" ],
     "build_component_paths" : [ "/home/aleksei/esp/esp-idf/components/esp_common", "/home/aleksei/esp/esp-idf/components/esp_hw_support", "/home/aleksei/esp/esp-idf/components/esp_rom", "/home/aleksei/esp/esp-idf/components/esp_system", "/home/aleksei/esp/esp-idf/components/freertos", "/home/aleksei/esp/esp-idf/components/hal", "/home/aleksei/esp/esp-idf/components/heap", "/home/aleksei/esp/esp-idf/components/linux", "/home/aleksei/esp/esp-idf/components/log", "/home/aleksei/esp/esp-idf/tools/test_apps/linux_compatible/hello_world_linux_compatible/main", "/home/aleksei/esp/esp-idf/components/soc", "" ],
-    "debug_prefix_map_gdbinit": ""
 }

tests/fixtures/unit_test_app_linux/build/project_description.json

@@ -1405,5 +1405,4 @@
             "include_dirs": [ "include" ]
         }
     },
-    "debug_prefix_map_gdbinit": ""
 }