Fix: Allow to link against GCOV (#614)

* Rust: link in test builds against gcov * Update the everest-framework --------- Signed-off-by: Dima Dorezyuk <[email protected]> Signed-off-by: Dima Dorezyuk <[email protected]> Co-authored-by: Dima Dorezyuk <[email protected]>
EVerest · Apr 5, 2024 · 75cc247 · 75cc247
1 parent 70d1136
commit 75cc247
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/cmake/everest-generate.cmake b/cmake/everest-generate.cmake
@@ -134,6 +134,12 @@ if (EVEREST_ENABLE_RS_SUPPORT)
         message(STATUS "Creating rust workspace at ${RUST_WORKSPACE_DIR}")
     endif ()
 
+    if (EVEREST_CORE_BUILD_TESTING)
+        set(EVERESTRS_FEATURE_FLAGS ",features = [\"link_gcov\"]")
+    else()
+        set(EVERESTRS_FEATURE_FLAGS "")
+    endif()
+
     # NOTE (aw): we could also write a small python script, which would do that for us
     add_custom_command(OUTPUT ${RUST_WORKSPACE_CARGO_FILE}
         COMMAND
@@ -149,7 +155,7 @@ if (EVEREST_ENABLE_RS_SUPPORT)
         COMMAND
             echo "[workspace.dependencies]" >> Cargo.toml
         COMMAND
-            echo "everestrs = { path = \"$<TARGET_PROPERTY:everest::everestrs_sys,EVERESTRS_DIR>\" }" >> Cargo.toml
+            echo "everestrs = { path = \"$<TARGET_PROPERTY:everest::everestrs_sys,EVERESTRS_DIR>\" ${EVERESTRS_FEATURE_FLAGS} }" >> Cargo.toml
         COMMAND
             echo "everestrs-build = { path = \"$<TARGET_PROPERTY:everest::everestrs_sys,EVERESTRS_BUILD_DIR>\" }" >> Cargo.toml
         COMMAND

diff --git a/modules/Cargo.lock b/modules/Cargo.lock
diff --git a/modules/Cargo.toml b/modules/Cargo.toml
@@ -7,5 +7,5 @@ members = [
 ]
 
 [workspace.dependencies]
-everestrs = { git = "https://github.com/everest/everest-framework.git", rev = "01468678f5b627a96791f749f3139c3d169bf081" }
-everestrs-build = { git = "https://github.com/everest/everest-framework.git", rev = "01468678f5b627a96791f749f3139c3d169bf081" }
+everestrs = { git = "https://github.com/everest/everest-framework.git", rev = "b9f9b5ddff46856027346a98f5c16d11b16f7436" }
+everestrs-build = { git = "https://github.com/everest/everest-framework.git", rev = "b9f9b5ddff46856027346a98f5c16d11b16f7436" }
diff --git a/third-party/bazel/repos.bzl b/third-party/bazel/repos.bzl
@@ -13,6 +13,6 @@ def everest_core_repos():
     maybe(
         http_archive,
         name = "everest-framework",
-        url = "https://github.com/everest/everest-framework/archive/86a2051ff9a087b82e70b3c93c09006fe8f99aab.tar.gz",
-        strip_prefix = "everest-framework-86a2051ff9a087b82e70b3c93c09006fe8f99aab",
+        url = "https://github.com/everest/everest-framework/archive/b9f9b5ddff46856027346a98f5c16d11b16f7436.tar.gz",
+        strip_prefix = "everest-framework-b9f9b5ddff46856027346a98f5c16d11b16f7436",
     )