Skip to content

Commit

Permalink
Fix communication tests not run (eProsima#3614)
Browse files Browse the repository at this point in the history
* Refs #19054: Fix communication tests not runned

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #19054: Clean before running the test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19054: Make test_wrapper.cmake a configurable file

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19054: Fix missing python path

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Co-authored-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: roscan-tech <liwei378@mail2.sysu.edu.cn>
  • Loading branch information
2 people authored and roscan-tech committed Sep 6, 2024
1 parent a6db7de commit 739b1f7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
8 changes: 8 additions & 0 deletions cmake/common/test_wrapper.cmake.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
find_package(PythonInterp 3)

# Clean first so the exit code comes from the second process
message(STATUS "test_wrapper - Running command: ${PYTHON_EXECUTABLE} @PROJECT_BINARY_DIR@/tools/fastdds/fastdds.py shm clean")
execute_process(COMMAND ${PYTHON_EXECUTABLE} @PROJECT_BINARY_DIR@/tools/fastdds/fastdds.py shm clean)

message(STATUS "test_wrapper - Running command: ${ACTUAL_TEST} ${ACTUAL_ARGS}")
execute_process(COMMAND ${ACTUAL_TEST} ${ACTUAL_ARGS})
13 changes: 13 additions & 0 deletions tools/fastdds/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@

project(fastdds-tool)

# copy fastdds.py in build dir
if(EPROSIMA_BUILD)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fastdds.py
${CMAKE_CURRENT_BINARY_DIR}/fastdds.py COPYONLY)

file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/discovery
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/shm
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xml_ci
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif()

###############################################################################
# Installation
###############################################################################
Expand Down

0 comments on commit 739b1f7

Please sign in to comment.