Prepend to PYTHONPATH in tests (#2673) (#2681)

Preserve the existing PYTHONPATH by prepending instead of replacing. Signed-off-by: Steve Peters <[email protected]> (cherry picked from commit 0d346de) Co-authored-by: Steve Peters <[email protected]>
gazebosim · Nov 19, 2024 · 1bbb645 · 1bbb645
1 parent 9889df4
commit 1bbb645
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -122,7 +122,7 @@ if (BUILD_TESTING)
     endif()
 
     set(_env_vars)
-    list(APPEND _env_vars "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/")
+    list(APPEND _env_vars "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/:$ENV{PYTHONPATH}")
     list(APPEND _env_vars "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}:$ENV{LD_LIBRARY_PATH}")
     set_tests_properties(${test} PROPERTIES
       ENVIRONMENT "${_env_vars}")

diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
@@ -247,5 +247,5 @@ endif()
 
 if (TARGET INTEGRATION_python_system_loader)
   set_tests_properties(INTEGRATION_python_system_loader PROPERTIES
-    ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/")
+    ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/:$ENV{PYTHONPATH}")
 endif()