pytest-cmake 0.12.0__tar.gz → 0.13.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytest-cmake
3
- Version: 0.12.0
3
+ Version: 0.13.0
4
4
  Summary: Provide CMake module for Pytest
5
5
  Project-URL: Documentation, https://python-cmake.github.io/pytest-cmake
6
6
  Project-URL: Repository, https://github.com/python-cmake/pytest-cmake
@@ -58,7 +58,7 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
58
58
  cmake_parse_arguments(
59
59
  PARSE_ARGV 1 "" "STRIP_PARAM_BRACKETS;INCLUDE_FILE_PATH;BUNDLE_TESTS"
60
60
  "WORKING_DIRECTORY;TRIM_FROM_NAME;TRIM_FROM_FULL_NAME"
61
- "LIBRARY_PATH_PREPEND;PYTHON_PATH_PREPEND;ENVIRONMENT;PROPERTIES;DEPENDS;EXTRA_ARGS"
61
+ "LIBRARY_PATH_PREPEND;PYTHON_PATH_PREPEND;ENVIRONMENT;PROPERTIES;DEPENDS;EXTRA_ARGS;DISCOVERY_EXTRA_ARGS"
62
62
  )
63
63
 
64
64
  # Set platform-specific library path environment variable.
@@ -133,6 +133,7 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
133
133
  -D "TEST_PROPERTIES=${_PROPERTIES}"
134
134
  -D "CTEST_FILE=${_tests_file}"
135
135
  -D "EXTRA_ARGS=${_EXTRA_ARGS}"
136
+ -D "DISCOVERY_EXTRA_ARGS=${_DISCOVERY_EXTRA_ARGS}"
136
137
  -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PytestAddTests.cmake")
137
138
 
138
139
  # Create a custom target to run the tests.
@@ -27,6 +27,10 @@ if(CMAKE_SCRIPT_MODE_FILE)
27
27
  endforeach()
28
28
 
29
29
  # Handle EXTRA_ARGS for individual tests
30
+ if(BUNDLE_TESTS)
31
+ list(PREPEND EXTRA_ARGS ${DISCOVERY_EXTRA_ARGS})
32
+ endif()
33
+
30
34
  set(EXTRA_ARGS_WRAPPED)
31
35
  foreach(arg IN LISTS EXTRA_ARGS)
32
36
  list(APPEND EXTRA_ARGS_WRAPPED "[==[${arg}]==]")
@@ -69,7 +73,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
69
73
  execute_process(
70
74
  COMMAND "${PYTEST_EXECUTABLE}"
71
75
  --collect-only -q
72
- --rootdir=${WORKING_DIRECTORY} .
76
+ --rootdir=${WORKING_DIRECTORY} ${DISCOVERY_EXTRA_ARGS} .
73
77
  OUTPUT_VARIABLE _output_lines
74
78
  ERROR_VARIABLE _output_lines
75
79
  OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -9,7 +9,7 @@ backend-path = ["."]
9
9
 
10
10
  [project]
11
11
  name = "pytest-cmake"
12
- version = "0.12.0"
12
+ version = "0.13.0"
13
13
  description = "Provide CMake module for Pytest"
14
14
  readme = "README.md"
15
15
  requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
@@ -60,7 +60,7 @@ class CreateCmakeConfig(install):
60
60
 
61
61
  setup(
62
62
  name="pytest-cmake",
63
- version="0.12.0",
63
+ version="0.13.0",
64
64
  data_files=[
65
65
  (
66
66
  "share/Pytest/cmake",
File without changes
File without changes
File without changes