Fix backward integration (#3677)

* Add tests to make sure blame works

* Add libdw and libbfd in coverage CI

Author: JCGoran

.github/workflows/coverage.yml

@@ -49,8 +49,11 @@ jobs:
 
       - name: Install apt packages
         run: |
-          sudo apt-get install xfonts-100dpi build-essential doxygen lcov libboost-all-dev libopenmpi-dev libmpich-dev libx11-dev libxcomposite-dev mpich openmpi-bin gpg ninja-build flex bison libfl-dev
+          sudo apt-get update
+          sudo apt-get install -y xfonts-100dpi build-essential doxygen lcov libboost-all-dev libopenmpi-dev libmpich-dev libx11-dev libxcomposite-dev mpich openmpi-bin gpg ninja-build flex bison libfl-dev libdw-dev binutils-dev
         shell: bash
+        env:
+          DEBIAN_FRONTEND: noninteractive
 
       - name: Install a new ccache
         run: |

CMakeLists.txt

@@ -479,6 +479,8 @@ endif()
 if(NRN_ENABLE_BACKTRACE)
   set(NRN_USE_BACKWARD 1)
   nrn_add_external_project(backward)
+  list(APPEND CMAKE_PREFIX_PATH ${PROJECT_SOURCE_DIR}/external/backward)
+  find_package(Backward REQUIRED)
 else()
   set(NRN_USE_BACKWARD 0)
 endif()

src/nmodl/utils/CMakeLists.txt

@@ -17,6 +17,7 @@ set_property(TARGET util PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(util PUBLIC fmt::fmt nlohmann_json::nlohmann_json spdlog::spdlog)
 
 if(NRN_ENABLE_BACKTRACE)
-  add_backward(util)
+  target_link_libraries(util PRIVATE Backward::Backward)
+  target_include_directories(util PRIVATE ${PROJECT_SOURCE_DIR}/external/backward)
   target_compile_definitions(util PUBLIC NRN_USE_BACKWARD=1)
 endif()

src/nrniv/CMakeLists.txt

@@ -462,7 +462,8 @@ set_property(TARGET nrniv_lib PROPERTY OUTPUT_NAME nrniv)
 # Link with backward-cpp if enabled
 # =============================================================================
 if(NRN_USE_BACKWARD)
-  add_backward(nrniv_lib)
+  target_link_libraries(nrniv_lib Backward::Backward)
+  target_include_directories(nrniv_lib PRIVATE ${PROJECT_SOURCE_DIR}/external/backward)
 endif()
 
 # =============================================================================

test/nmodl/transpiler/integration/CMakeLists.txt

@@ -11,16 +11,26 @@ file(GLOB modfiles CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/mod/*.mod")
 foreach(modfile ${modfiles})
   get_filename_component(modfile_name "${modfile}" NAME)
   add_test(NAME ${modfile_name} COMMAND $<TARGET_FILE:nmodl> ${modfile})
+  if(NRN_ENABLE_BACKTRACE)
+    add_test(NAME ${modfile_name}_with_blame COMMAND $<TARGET_FILE:nmodl> ${modfile} blame --line 2)
+  endif()
   if(WIN32)
     set(NMODL_TEST_PYTHONPATH "${PROJECT_BINARY_DIR}/lib;$ENV{PYTHONPATH}")
   else()
     set(NMODL_TEST_PYTHONPATH "${PROJECT_BINARY_DIR}/lib:$ENV{PYTHONPATH}")
   endif()
-  set_tests_properties(
-    ${modfile_name}
-    PROPERTIES
-      ENVIRONMENT
-      "PYTHONPATH=${NMODL_TEST_PYTHONPATH};NMODL_PYLIB=${PYTHON_LIBRARY};NMODLHOME=${CMAKE_BINARY_DIR}"
-  )
-  cpp_cc_configure_sanitizers(TEST ${modfile_name})
+  if(NRN_ENABLE_BACKTRACE)
+    set(tests ${modfile_name} ${modfile_name}_with_blame)
+  else()
+    set(tests ${modfile_name})
+  endif()
+  foreach(test IN LISTS tests)
+    set_tests_properties(
+      ${test}
+      PROPERTIES
+        ENVIRONMENT
+        "PYTHONPATH=${NMODL_TEST_PYTHONPATH};NMODL_PYLIB=${PYTHON_LIBRARY};NMODLHOME=${CMAKE_BINARY_DIR}"
+    )
+    cpp_cc_configure_sanitizers(TEST ${test})
+  endforeach()
 endforeach()