pytest-cmake 0.9.0__tar.gz → 0.10.0__tar.gz

{pytest_cmake-0.9.0 → pytest_cmake-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-cmake
-Version: 0.9.0
+Version: 0.10.0
 Summary: Provide CMake module for Pytest
 Project-URL: Documentation, https://python-cmake.github.io/pytest-cmake
 Project-URL: Repository, https://github.com/python-cmake/pytest-cmake

{pytest_cmake-0.9.0 → pytest_cmake-0.10.0}/cmake/FindPytest.cmake

@@ -55,8 +55,8 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
 
     function(pytest_discover_tests NAME)
         cmake_parse_arguments(
-            PARSE_ARGV 1 "" "STRIP_PARAM_BRACKETS;BUNDLE_TESTS"
-            "WORKING_DIRECTORY;TRIM_FROM_NAME"
+            PARSE_ARGV 1 "" "STRIP_PARAM_BRACKETS;INCLUDE_FILE_PATH;BUNDLE_TESTS"
+            "WORKING_DIRECTORY;TRIM_FROM_NAME;TRIM_FROM_FULL_NAME"
             "LIBRARY_PATH_PREPEND;PYTHON_PATH_PREPEND;ENVIRONMENT;DEPENDS"
         )
 
@@ -100,13 +100,13 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
             set(_BUNDLE_TESTS $ENV{BUNDLE_PYTHON_TESTS})
         endif()
 
-	# Serialize environment if necessary.
-	set(ENCODED_ENVIRONMENT "")
-	foreach(env ${_ENVIRONMENT})
-            string(REPLACE [[\]] [\\]] env ${env})
-	    string(REPLACE [[;]] [\\;]] env ${env})
-	    list(APPEND ENCODED_ENVIRONMENT ${env})
-	endforeach()
+        # Serialize environment if necessary.
+        set(ENCODED_ENVIRONMENT "")
+        foreach(env ${_ENVIRONMENT})
+                string(REPLACE [[\]] [\\]] env ${env})
+            string(REPLACE [[;]] [\\;]] env ${env})
+            list(APPEND ENCODED_ENVIRONMENT ${env})
+        endforeach()
 
         set(_include_file "${CMAKE_CURRENT_BINARY_DIR}/${NAME}_include.cmake")
         set(_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${NAME}_tests.cmake")
@@ -123,10 +123,11 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
             -D "LIBRARY_PATH=${LIBRARY_PATH}"
             -D "PYTHON_PATH=${PYTHON_PATH}"
             -D "TRIM_FROM_NAME=${_TRIM_FROM_NAME}"
+            -D "TRIM_FROM_FULL_NAME=${_TRIM_FROM_FULL_NAME}"
             -D "STRIP_PARAM_BRACKETS=${_STRIP_PARAM_BRACKETS}"
+            -D "INCLUDE_FILE_PATH=${_INCLUDE_FILE_PATH}"
             -D "WORKING_DIRECTORY=${_WORKING_DIRECTORY}"
             -D "ENVIRONMENT=${ENCODED_ENVIRONMENT}"
-            -D "PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}"
             -D "CTEST_FILE=${_tests_file}"
             -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PytestAddTests.cmake")
 

{pytest_cmake-0.9.0 → pytest_cmake-0.10.0}/cmake/PytestAddTests.cmake

@@ -61,7 +61,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
             WORKING_DIRECTORY ${WORKING_DIRECTORY}
         )
 
-        string(REGEX MATCH "=+ ERRORS =+(.*)" _error ${_output_lines})
+        string(REGEX MATCH "=+ ERRORS =+(.*)" _error "${_output_lines}")
 
         if (_error)
             message(${_error})
@@ -72,7 +72,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
         string(REPLACE [[;]] [[\;]] _output_lines "${_output_lines}")
         string(REPLACE "\n" ";" _output_lines "${_output_lines}")
 
-        set(test_pattern "([^:]+)(::([^:]+))?::([^:]+)")
+        set(test_pattern "([^:]+)\.py(::([^:]+))?::([^:]+)")
 
         foreach (line ${_output_lines})
             string(REGEX MATCHALL ${test_pattern} matching "${line}")
@@ -82,13 +82,13 @@ if(CMAKE_SCRIPT_MODE_FILE)
                 continue()
             endif()
 
+            set(_file ${CMAKE_MATCH_1})
             set(_class ${CMAKE_MATCH_3})
             set(_func ${CMAKE_MATCH_4})
 
             if (TRIM_FROM_NAME)
-                set(pattern "${TRIM_FROM_NAME}")
-                string(REGEX REPLACE "${pattern}" "" _class "${_class}")
-                string(REGEX REPLACE "${pattern}" "" _func "${_func}")
+                string(REGEX REPLACE "${TRIM_FROM_NAME}" "" _class "${_class}")
+                string(REGEX REPLACE "${TRIM_FROM_NAME}" "" _func "${_func}")
             endif()
 
             if (_class)
@@ -101,6 +101,16 @@ if(CMAKE_SCRIPT_MODE_FILE)
                 string(REGEX REPLACE "\\[(.+)\\]$" ".\\1" test_name "${test_name}")
             endif()
 
+            if (INCLUDE_FILE_PATH)
+                cmake_path(CONVERT "${_file}" TO_CMAKE_PATH_LIST _file)
+                string(REGEX REPLACE "/" "." _file "${_file}")
+                set(test_name "${_file}.${test_name}")
+            endif()
+
+            if (TRIM_FROM_FULL_NAME)
+                string(REGEX REPLACE "${TRIM_FROM_FULL_NAME}" "" test_name "${test_name}")
+            endif()
+
             set(test_name "${TEST_GROUP_NAME}.${test_name}")
             set(test_case "${WORKING_DIRECTORY}/${line}")
 

{pytest_cmake-0.9.0 → pytest_cmake-0.10.0}/pyproject.toml

@@ -9,7 +9,7 @@ backend-path = ["."]
 
 [project]
 name = "pytest-cmake"
-version = "0.9.0"
+version = "0.10.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.9.0 → pytest_cmake-0.10.0}/setup.py

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