diff --git a/.github/workflows/check-changelog.yml b/.github/workflows/check-changelog.yml index d998bcab35..da9c25bd22 100644 --- a/.github/workflows/check-changelog.yml +++ b/.github/workflows/check-changelog.yml @@ -1,6 +1,7 @@ name: Check-changelog on: pull_request: + types: [assigned, opened, synchronize, reopened, labeled, unlabeled] branches: - devel jobs: diff --git a/.gitmodules b/.gitmodules index b312ac8b42..aafbaa4876 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "cmake"] path = cmake - url = https://github.com/jrl-umi3218/jrl-cmakemodules + url = https://github.com/jorisv/jrl-cmakemodules [submodule "models/example-robot-data"] path = models/example-robot-data url = https://github.com/Gepetto/example-robot-data.git diff --git a/cmake b/cmake index 570915059b..936d078804 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 570915059b50f7dead7dae4c7f782ad3612fdc6e +Subproject commit 936d0788042a6b4442571a9c65e5cd21c7c1ce55 diff --git a/unittest/python/CMakeLists.txt b/unittest/python/CMakeLists.txt index 8cece0327c..2fb9fba4cf 100644 --- a/unittest/python/CMakeLists.txt +++ b/unittest/python/CMakeLists.txt @@ -2,45 +2,6 @@ # Copyright (c) 2015-2023 CNRS INRIA # -macro(ADD_PYTHON_MEMORYCHECK_UNIT_TEST NAME SOURCE) - set(TEST_FILE_NAME memorycheck_unit_test_${NAME}.cmake) - set(PYTHON_TEST_SCRIPT "${PROJECT_SOURCE_DIR}/${SOURCE}") - configure_file(memorycheck_unit_test.cmake.in ${TEST_FILE_NAME} @ONLY) - - add_test(NAME ${NAME} - COMMAND ${CMAKE_COMMAND} -P ${TEST_FILE_NAME}) - - set(MODULES "${ARGN}") # ARGN is not a variable - foreach(MODULE_PATH IN LISTS MODULES) - list(APPEND PYTHONPATH "${CMAKE_BINARY_DIR}/${MODULE_PATH}") - endforeach() - - if(DEFINED ENV{PYTHONPATH}) - list(APPEND PYTHONPATH "$ENV{PYTHONPATH}") - endif() - - # get path separator to join those paths - execute_process( - COMMAND "${PYTHON_EXECUTABLE}" "-c" "import os; print(os.pathsep)" - OUTPUT_VARIABLE PATHSEP - OUTPUT_STRIP_TRAILING_WHITESPACE) - - list(REMOVE_DUPLICATES PYTHONPATH) - if(WIN32) - # ensure that severals paths stay together as ENV variable PYTHONPATH when - # passed to python test via PROPERTIES - string(REPLACE ";" "\;" PYTHONPATH_STR "${PYTHONPATH}") - else(WIN32) - string(REPLACE ";" "${PATHSEP}" PYTHONPATH_STR "${PYTHONPATH}") - endif(WIN32) - set(ENV_VARIABLES "PYTHONPATH=${PYTHONPATH_STR}") - if(APPLE) - list(APPEND ENV_VARIABLES "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}") - list(APPEND ENV_VARIABLES "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}") - endif(APPLE) - set_tests_properties(${NAME} PROPERTIES ENVIRONMENT "${ENV_VARIABLES}") -endmacro() - SET(${PROJECT_NAME}_PYTHON_TESTS bindings diff --git a/unittest/python/memorycheck_unit_test.cmake.in b/unittest/python/memorycheck_unit_test.cmake.in deleted file mode 100644 index ce3cde0d53..0000000000 --- a/unittest/python/memorycheck_unit_test.cmake.in +++ /dev/null @@ -1,17 +0,0 @@ -SET(PYTHON_EXECUTABLE @PYTHON_EXECUTABLE@) -SET(MEMORYCHECK_COMMAND @MEMORYCHECK_COMMAND@) -SET(PYTHON_TEST_SCRIPT @PYTHON_TEST_SCRIPT@) - -execute_process(COMMAND - ${MEMORYCHECK_COMMAND} -- ${PYTHON_EXECUTABLE} ${PYTHON_TEST_SCRIPT} - ERROR_VARIABLE MEMORYCHECK_OUTPUT) - -string(FIND "${MEMORYCHECK_OUTPUT}" "definitely lost: 0 bytes in 0 blocks" DEFINITELY_LOST) -string(FIND "${MEMORYCHECK_OUTPUT}" "indirectly lost: 0 bytes in 0 blocks" INDIRECTLY_LOST) - -if(${DEFINITELY_LOST} GREATER -1 AND ${INDIRECTLY_LOST} GREATER -1) - message(STATUS "${PYTHON_TEST_SCRIPT} is not leaking memory") -else() - message(FATAL_ERROR "Output: ${MEMORYCHECK_OUTPUT}\n" - "${PYTHON_TEST_SCRIPT} is leaking memory\n") -endif()