pytest-cmake 0.5.2__tar.gz → 0.6.0__tar.gz

{pytest_cmake-0.5.2 → pytest_cmake-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-cmake
-Version: 0.5.2
+Version: 0.6.0
 Summary: Provide CMake module for Pytest
 Author-email: Jeremy Retailleau <jeremy.retailleau@gmail.com>
 License: MIT License

{pytest_cmake-0.5.2 → pytest_cmake-0.6.0}/cmake/FindPytest.cmake

@@ -60,41 +60,35 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
             "LIBRARY_PATH_PREPEND;PYTHON_PATH_PREPEND;ENVIRONMENT;DEPENDS"
         )
 
-        # Set library path depending on the platform.
+        # Identify library path environment name depending on the platform.
         if (CMAKE_SYSTEM_NAME STREQUAL Windows)
-            set(LIB_ENV_PATH PATH)
-            set(_env_sep "\\\;")
+            set(LIBRARY_ENV_NAME PATH)
         elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-            set(LIB_ENV_PATH DYLD_LIBRARY_PATH)
-            set(_env_sep ":")
+            set(LIBRARY_ENV_NAME DYLD_LIBRARY_PATH)
         else()
-            set(LIB_ENV_PATH LD_LIBRARY_PATH)
-            set(_env_sep ":")
+            set(LIBRARY_ENV_NAME LD_LIBRARY_PATH)
         endif()
 
-        # Convert all paths into cmake paths.
-        cmake_path(CONVERT "$ENV{${LIB_ENV_PATH}}" TO_CMAKE_PATH_LIST libpath)
-        cmake_path(CONVERT "$ENV{PYTHONPATH}" TO_CMAKE_PATH_LIST pythonpath)
+        # Sanitize all paths for CMake.
+        cmake_path(CONVERT "$ENV{${LIBRARY_ENV_NAME}}" TO_CMAKE_PATH_LIST LIBRARY_PATH)
+        cmake_path(CONVERT "$ENV{PYTHONPATH}" TO_CMAKE_PATH_LIST PYTHON_PATH)
 
-        # Prepend input path to environment variables
+        # Prepend input path to environment variables.
         if (_LIBRARY_PATH_PREPEND)
             list(REVERSE _LIBRARY_PATH_PREPEND)
             foreach (_path ${_LIBRARY_PATH_PREPEND})
-                set(libpath "${_path}" "${libpath}")
+                set(LIBRARY_PATH "${_path}" "${LIBRARY_PATH}")
             endforeach()
         endif()
 
         if (_PYTHON_PATH_PREPEND)
             list(REVERSE _PYTHON_PATH_PREPEND)
             foreach (_path ${_PYTHON_PATH_PREPEND})
-                set(pythonpath "${_path}" "${pythonpath}")
+                set(PYTHON_PATH "${_path}" "${PYTHON_PATH}")
             endforeach()
         endif()
 
-        # Convert list into string.
-        list(JOIN libpath "${_env_sep}" libpath)
-        list(JOIN pythonpath "${_env_sep}" pythonpath)
-
+        # Default working directory to current build path if none is provided.
         if (NOT _WORKING_DIRECTORY)
             set(_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
         endif()
@@ -116,9 +110,9 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
             -D "PYTEST_EXECUTABLE=${PYTEST_EXECUTABLE}"
             -D "TEST_GROUP_NAME=${NAME}"
             -D "BUNDLE_TESTS=${_BUNDLE_TESTS}"
-            -D "LIB_ENV_PATH=${LIB_ENV_PATH}"
-            -D "LIBRARY_PATH=${libpath}"
-            -D "PYTHON_PATH=${pythonpath}"
+            -D "LIBRARY_ENV_NAME=${LIBRARY_ENV_NAME}"
+            -D "LIBRARY_PATH=${LIBRARY_PATH}"
+            -D "PYTHON_PATH=${PYTHON_PATH}"
             -D "TRIM_FROM_NAME=${_TRIM_FROM_NAME}"
             -D "WORKING_DIRECTORY=${_WORKING_DIRECTORY}"
             -D "ENVIRONMENT=${_ENVIRONMENT}"

{pytest_cmake-0.5.2 → pytest_cmake-0.6.0}/cmake/PytestAddTests.cmake

@@ -6,10 +6,17 @@ if(CMAKE_SCRIPT_MODE_FILE)
     # Set Cmake test file to execute each test.
     set(_content "")
 
-    # Ensure that list environment variables are
-    # represented as a string on Windows.
-    string(REPLACE [[;]] [[\;]] LIBRARY_PATH "${LIBRARY_PATH}")
-    string(REPLACE [[;]] [[\;]] PYTHON_PATH "${PYTHON_PATH}")
+    cmake_path(CONVERT "${LIBRARY_PATH}" TO_NATIVE_PATH_LIST LIBRARY_PATH)
+    cmake_path(CONVERT "${PYTHON_PATH}" TO_NATIVE_PATH_LIST PYTHON_PATH)
+
+    # Serialize path values separated by semicolons (required on Windows).
+    macro(encode_value VARIABLE_NAME)
+        string(REPLACE [[\]] [[\\]] ${VARIABLE_NAME} "${${VARIABLE_NAME}}")
+        string(REPLACE [[;]] [[\\;]] ${VARIABLE_NAME} "${${VARIABLE_NAME}}")
+    endmacro()
+
+    encode_value(LIBRARY_PATH)
+    encode_value(PYTHON_PATH)
 
     if (BUNDLE_TESTS)
         string(APPEND _content
@@ -19,7 +26,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
             ")\n"
             "set_tests_properties(\n"
             "     \"${TEST_GROUP_NAME}\" PROPERTIES\n"
-            "     ENVIRONMENT \"${LIB_ENV_PATH}=${LIBRARY_PATH}\"\n"
+            "     ENVIRONMENT \"${LIBRARY_ENV_NAME}=${LIBRARY_PATH}\"\n"
             ")\n"
             "set_tests_properties(\n"
             "     \"${TEST_GROUP_NAME}\"\n"
@@ -29,6 +36,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
         )
 
         foreach(env ${ENVIRONMENT})
+            encode_value(env)
             string(APPEND _content
                 "set_tests_properties(\n"
                 "     \"${TEST_GROUP_NAME}\"\n"
@@ -40,7 +48,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
 
     else()
         # Set environment for collecting tests.
-        set(ENV{${LIB_ENV_PATH}} "${LIBRARY_PATH}")
+        set(ENV{${LIBRARY_ENV_NAME}} "${LIBRARY_PATH}")
         set(ENV{PYTHONPATH} "${PYTHON_PATH}")
         set(ENV{PYTHONWARNINGS} "ignore")
 
@@ -99,7 +107,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
                 ")\n"
                 "set_tests_properties(\n"
                 "     \"${test_name}\" PROPERTIES\n"
-                "     ENVIRONMENT \"${LIB_ENV_PATH}=${LIBRARY_PATH}\"\n"
+                "     ENVIRONMENT \"${LIBRARY_ENV_NAME}=${LIBRARY_PATH}\"\n"
                 ")\n"
                 "set_tests_properties(\n"
                 "     \"${test_name}\"\n"
@@ -109,6 +117,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
             )
 
             foreach(env ${ENVIRONMENT})
+                encode_value(env)
                 string(APPEND _content
                     "set_tests_properties(\n"
                     "     \"${test_name}\"\n"

{pytest_cmake-0.5.2 → pytest_cmake-0.6.0}/pyproject.toml

@@ -9,7 +9,7 @@ backend-path = ["."]
 
 [project]
 name = "pytest-cmake"
-version = "0.5.2"
+version = "0.6.0"
 description = "Provide CMake module for Pytest"
 readme = "README.md"
 requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"

{pytest_cmake-0.5.2 → pytest_cmake-0.6.0}/setup.py

@@ -60,7 +60,7 @@ class CreateCmakeConfig(install):
 
 setup(
     name="pytest-cmake",
-    version="0.5.2",
+    version="0.6.0",
     data_files=[
         (
             "share/Pytest/cmake",