Skip to content

Commit b69aef5

Browse files
authored
Merge pull request ceph#65699 from phlogistonjohn/jjm-py-cmake-labels
pybind/mgr: add default set of cmake/ctest labels to tests
2 parents a516838 + 8258d27 commit b69aef5

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

cmake/modules/AddCephTest.cmake

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ endfunction()
9191
function(add_tox_test name)
9292
set(test_name run-tox-${name})
9393
set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv)
94-
cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN})
94+
cmake_parse_arguments(TOXTEST "" "TOX_PATH;LABELS" "TOX_ENVS" ${ARGN})
9595
if(DEFINED TOXTEST_TOX_PATH)
9696
set(tox_path ${TOXTEST_TOX_PATH})
9797
else()
@@ -124,6 +124,18 @@ function(add_tox_test name)
124124
--venv-path ${venv_path})
125125
set_tests_properties(${test_name} PROPERTIES
126126
FIXTURES_REQUIRED venv-for-${name})
127+
set(toxtest_default_labels "PurePython;PythonTox")
128+
if(DEFINED TOXTEST_LABELS)
129+
set_tests_properties(
130+
${test_name}
131+
PROPERTIES
132+
LABELS "${toxtest_default_labels};${TOXTEST_LABELS}")
133+
else()
134+
set_tests_properties(
135+
${test_name}
136+
PROPERTIES
137+
LABELS "${toxtest_default_labels}")
138+
endif()
127139
set_property(
128140
TEST ${test_name}
129141
PROPERTY ENVIRONMENT

0 commit comments

Comments
 (0)